remotes/origin/mitri4
spacenergy 10 years ago
parent e6fd77fe0a
commit 6de3bbc8fb
  1. 4
      main/views.py
  2. 2
      store/admin.py
  3. 25
      store/migrations/0052_auto_20160404_1025.py
  4. 20
      store/migrations/0053_productvariation_delivery_date.py
  5. 3
      store/models.py

@ -92,6 +92,7 @@ def temp_count_update(request, article):
product = ProductVariation.objects.get(article__iexact=article)
count = request.GET.get('count', None)
price = request.GET.get('price', None)
delivery_date = request.GET.get('delivery_date', None)
if count != None:
count = count.replace(',', '.')
if int(count) < 0:
@ -104,6 +105,9 @@ def temp_count_update(request, article):
price = 0
product.price = int(price)
product.save()
if delivery_date != None:
product.delivery_date = delivery_date
product.save()
else:
retval['error_code'] = 1
except ProductVariation.DoesNotExist:

@ -78,7 +78,7 @@ class ProductVariationInline(admin.TabularInline):
@admin.register(ProductVariation)
class ProductVariationAdmin(admin.ModelAdmin):
model = ProductVariation
list_display = ['product', 'variation', 'article', 'price', 'weight', 'in_stock', 'discount']
list_display = ['product', 'variation', 'article', 'price', 'weight', 'in_stock', 'discount', 'delivery_date']
search_fields = ['variation', 'article']
list_filter = ['discount', ]

File diff suppressed because one or more lines are too long

@ -0,0 +1,20 @@
# -*- coding: utf-8 -*-
# Generated by Django 1.9.3 on 2016-04-04 10:30
from __future__ import unicode_literals
from django.db import migrations, models
class Migration(migrations.Migration):
dependencies = [
('store', '0052_auto_20160404_1025'),
]
operations = [
migrations.AddField(
model_name='productvariation',
name='delivery_date',
field=models.CharField(blank=True, default=None, max_length=20, null=True, verbose_name='Дата доставки'),
),
]

@ -180,7 +180,7 @@ class Product(models.Model):
description = models.TextField(
'Описание', default='', null=True, blank=True)
brand = models.ForeignKey(Brand, verbose_name='Брэнд')
video = models.CharField('Код Youtube', max_length=256, default='')
video = models.CharField('Код Youtube', max_length=256, default='', null=True, blank=True)
attirbutes = models.ManyToManyField(
AttributeForCategory, through='AttributesInProduct')
is_leader = models.BooleanField('Лидер продаж', default=False)
@ -258,6 +258,7 @@ class ProductVariation(models.Model):
'Артикул', max_length=32, null=True, blank=True, default='')
weight = models.FloatField('Вес (кг)', default=0.1, null=False, blank=False)
discount = models.IntegerField('Скидка %', default=0, blank=False, null=False)
delivery_date = models.CharField('Дата доставки', default=None, blank=True, null=True, max_length=20)
class Meta:
verbose_name = 'разновидность товара'

Loading…
Cancel
Save