remotes/origin/mitri4
spacenergy 10 years ago
parent 6aadae41c0
commit 8c501cf69d
  1. 22
      main/views.py
  2. 4
      store/admin.py
  3. 24
      store/migrations/0040_auto_20151123_1300.py
  4. 19
      store/migrations/0041_product_priority.py
  5. 2
      store/models.py

@ -8,10 +8,13 @@ from store.models import Product, Category, ProductVariation
def index(request): def index(request):
products = Product.objects.filter(on_main=True).order_by('priority', '-pk')
if not products:
products = Product.objects.order_by('-pk')[:8]
c = dict( c = dict(
products=Product.objects.order_by('-pk')[:8], products=products,
aaa=[1,2,3,4,5,6,7,8,9,0], # aaa=[1,2,3,4,5,6,7,8,9,0],
banners=Banner.objects.filter(is_active=True), banners=Banner.objects.filter(is_active=True),
) )
@ -21,45 +24,59 @@ def index(request):
def advantages(request): def advantages(request):
return render(request, 'advantages.jinja') return render(request, 'advantages.jinja')
def payment(request): def payment(request):
return render(request, 'payment.jinja') return render(request, 'payment.jinja')
def delivery(request): def delivery(request):
return render(request, 'delivery.jinja') return render(request, 'delivery.jinja')
def contacts(request): def contacts(request):
return render(request, 'contacts.jinja') return render(request, 'contacts.jinja')
def faq(request): def faq(request):
return render(request, 'faq.jinja') return render(request, 'faq.jinja')
def size_beuchat(request): def size_beuchat(request):
return render(request, 'size/beuchat.jinja') return render(request, 'size/beuchat.jinja')
def size_index(request): def size_index(request):
return render(request, 'size/index.jinja') return render(request, 'size/index.jinja')
def size_scorpena(request): def size_scorpena(request):
return render(request, 'size/scorpena.jinja') return render(request, 'size/scorpena.jinja')
def size_sargan(request): def size_sargan(request):
return render(request, 'size/sargan.jinja') return render(request, 'size/sargan.jinja')
def size_omer_sporasub(request): def size_omer_sporasub(request):
return render(request, 'size/omer_sporasub.jinja') return render(request, 'size/omer_sporasub.jinja')
def size_aqua_discovery(request): def size_aqua_discovery(request):
return render(request, 'size/aqua_discovery.jinja') return render(request, 'size/aqua_discovery.jinja')
def size_aqualung(request): def size_aqualung(request):
return render(request, 'size/aqualung.jinja') return render(request, 'size/aqualung.jinja')
def size_aquatics(request): def size_aquatics(request):
return render(request, 'size/aquatics.jinja') return render(request, 'size/aquatics.jinja')
def size_cressi(request): def size_cressi(request):
return render(request, 'size/cressi.jinja') return render(request, 'size/cressi.jinja')
def temp_count_update(request, article): def temp_count_update(request, article):
retval = dict(error_code=0) retval = dict(error_code=0)
try: try:
@ -86,6 +103,7 @@ def temp_count_update(request, article):
retval['error_code'] = e retval['error_code'] = e
return JsonResponse(retval) return JsonResponse(retval)
def feedback(request): def feedback(request):
form = FeedbackForm(request.POST or None) form = FeedbackForm(request.POST or None)
if form.is_valid(): if form.is_valid():

@ -74,7 +74,9 @@ class ProductVariationAdmin(admin.ModelAdmin):
@admin.register(Product) @admin.register(Product)
class ProductAdmin(admin.ModelAdmin): class ProductAdmin(admin.ModelAdmin):
list_display = ('title',) list_display = ('title', 'is_leader', 'priority', 'on_main')
list_editable = ('is_leader', 'priority', 'on_main')
search_fields = ('title', 'slug')
prepopulated_fields = {"slug": ("title",)} prepopulated_fields = {"slug": ("title",)}
inlines = [ImageInProductInline, inlines = [ImageInProductInline,
ProductVariationInline, AttributesInProductInline] ProductVariationInline, AttributesInProductInline]

File diff suppressed because one or more lines are too long

@ -0,0 +1,19 @@
# -*- coding: utf-8 -*-
from __future__ import unicode_literals
from django.db import models, migrations
class Migration(migrations.Migration):
dependencies = [
('store', '0040_auto_20151123_1300'),
]
operations = [
migrations.AddField(
model_name='product',
name='priority',
field=models.IntegerField(default=0, verbose_name='Приоритет для главной'),
),
]

@ -174,6 +174,8 @@ class Product(models.Model):
attirbutes = models.ManyToManyField( attirbutes = models.ManyToManyField(
AttributeForCategory, through='AttributesInProduct') AttributeForCategory, through='AttributesInProduct')
is_leader = models.BooleanField('Лидер продаж', default=False) is_leader = models.BooleanField('Лидер продаж', default=False)
on_main = models.BooleanField('На главной', default=False)
priority = models.IntegerField('Приоритет для главной', default=0)
class Meta: class Meta:
verbose_name = 'товар' verbose_name = 'товар'

Loading…
Cancel
Save