diff --git a/NITAKUSHOP/__pycache__/__init__.cpython-311.pyc b/NITAKUSHOP/__pycache__/__init__.cpython-311.pyc index f46749a..174002b 100644 Binary files a/NITAKUSHOP/__pycache__/__init__.cpython-311.pyc and b/NITAKUSHOP/__pycache__/__init__.cpython-311.pyc differ diff --git a/NITAKUSHOP/__pycache__/settings.cpython-311.pyc b/NITAKUSHOP/__pycache__/settings.cpython-311.pyc index b54e863..93e310c 100644 Binary files a/NITAKUSHOP/__pycache__/settings.cpython-311.pyc and b/NITAKUSHOP/__pycache__/settings.cpython-311.pyc differ diff --git a/NITAKUSHOP/__pycache__/urls.cpython-311.pyc b/NITAKUSHOP/__pycache__/urls.cpython-311.pyc index 9631f94..d554187 100644 Binary files a/NITAKUSHOP/__pycache__/urls.cpython-311.pyc and b/NITAKUSHOP/__pycache__/urls.cpython-311.pyc differ diff --git a/NITAKUSHOP/__pycache__/wsgi.cpython-311.pyc b/NITAKUSHOP/__pycache__/wsgi.cpython-311.pyc index 2e10442..8bb1fd8 100644 Binary files a/NITAKUSHOP/__pycache__/wsgi.cpython-311.pyc and b/NITAKUSHOP/__pycache__/wsgi.cpython-311.pyc differ diff --git a/db.sqlite3 b/db.sqlite3 index 8b42959..f34fce9 100644 Binary files a/db.sqlite3 and b/db.sqlite3 differ diff --git a/main/__pycache__/__init__.cpython-311.pyc b/main/__pycache__/__init__.cpython-311.pyc index fd5f93f..57e72cf 100644 Binary files a/main/__pycache__/__init__.cpython-311.pyc and b/main/__pycache__/__init__.cpython-311.pyc differ diff --git a/main/__pycache__/admin.cpython-311.pyc b/main/__pycache__/admin.cpython-311.pyc index c8f871e..b9d80d3 100644 Binary files a/main/__pycache__/admin.cpython-311.pyc and b/main/__pycache__/admin.cpython-311.pyc differ diff --git a/main/__pycache__/apps.cpython-311.pyc b/main/__pycache__/apps.cpython-311.pyc index fbddb00..cf94541 100644 Binary files a/main/__pycache__/apps.cpython-311.pyc and b/main/__pycache__/apps.cpython-311.pyc differ diff --git a/main/__pycache__/models.cpython-311.pyc b/main/__pycache__/models.cpython-311.pyc index 6789075..968f65e 100644 Binary files a/main/__pycache__/models.cpython-311.pyc and b/main/__pycache__/models.cpython-311.pyc differ diff --git a/main/__pycache__/urls.cpython-311.pyc b/main/__pycache__/urls.cpython-311.pyc index 6bffd70..2e636b6 100644 Binary files a/main/__pycache__/urls.cpython-311.pyc and b/main/__pycache__/urls.cpython-311.pyc differ diff --git a/main/__pycache__/views.cpython-311.pyc b/main/__pycache__/views.cpython-311.pyc index 037d13d..546e166 100644 Binary files a/main/__pycache__/views.cpython-311.pyc and b/main/__pycache__/views.cpython-311.pyc differ diff --git a/main/migrations/0002_product_link.py b/main/migrations/0002_product_link.py new file mode 100644 index 0000000..9a6bf8a --- /dev/null +++ b/main/migrations/0002_product_link.py @@ -0,0 +1,18 @@ +# Generated by Django 4.2.7 on 2024-03-11 07:54 + +from django.db import migrations, models + + +class Migration(migrations.Migration): + + dependencies = [ + ('main', '0001_initial'), + ] + + operations = [ + migrations.AddField( + model_name='product', + name='link', + field=models.URLField(blank=True, max_length=1024, null=True), + ), + ] diff --git a/main/migrations/__pycache__/0001_initial.cpython-311.pyc b/main/migrations/__pycache__/0001_initial.cpython-311.pyc index 3c855ba..65356eb 100644 Binary files a/main/migrations/__pycache__/0001_initial.cpython-311.pyc and b/main/migrations/__pycache__/0001_initial.cpython-311.pyc differ diff --git a/main/migrations/__pycache__/__init__.cpython-311.pyc b/main/migrations/__pycache__/__init__.cpython-311.pyc index b7c9c64..ec293a1 100644 Binary files a/main/migrations/__pycache__/__init__.cpython-311.pyc and b/main/migrations/__pycache__/__init__.cpython-311.pyc differ diff --git a/main/models.py b/main/models.py index 751a78c..8aa4f86 100644 --- a/main/models.py +++ b/main/models.py @@ -20,6 +20,8 @@ class Category(models.Model): args=[self.slug]) class Product(models.Model): + + category = models.ForeignKey(Category, related_name='products', on_delete=models.CASCADE) @@ -33,7 +35,7 @@ class Product(models.Model): available = models.BooleanField(default=True) created = models.DateTimeField(auto_now_add=True) updated = models.DateTimeField(auto_now=True) - + link = models.URLField(max_length=1024, blank=True, null=True) class Meta: ordering = ['name'] @@ -47,7 +49,4 @@ class Product(models.Model): return self.name def get_absolute_url(self): - return reverse('main:product_detail', - args=[self.id, self.slug]) - - + return self.link \ No newline at end of file diff --git a/main/templates/main/base.html b/main/templates/main/base.html index 017893e..0abce30 100644 --- a/main/templates/main/base.html +++ b/main/templates/main/base.html @@ -89,7 +89,7 @@ {# #} {#

{{ product.description }}

#} {#
#} -{#

{{ product.price }}₸

#} +{# {#
#} {# #} {# #} diff --git a/main/templates/main/product/detail.html b/main/templates/main/product/detail.html index 663c06b..f2c67ec 100644 --- a/main/templates/main/product/detail.html +++ b/main/templates/main/product/detail.html @@ -99,7 +99,6 @@

{{ product.price }}₸

Вернуться на главную - diff --git a/main/templates/main/product/list.html b/main/templates/main/product/list.html index bdcd854..213e4c3 100644 --- a/main/templates/main/product/list.html +++ b/main/templates/main/product/list.html @@ -37,9 +37,7 @@

{{ product.name }}

{{ product.description }}

-
-

{{ product.price }}₸

-
+ diff --git a/main/views.py b/main/views.py index f452928..d67485b 100644 --- a/main/views.py +++ b/main/views.py @@ -40,5 +40,5 @@ def product_detail(request, id, slug): slug=slug, available=True) return render(request, - 'main/product/detail.html', + product.link, {'product': product}) \ No newline at end of file