From 5a56c404a41b01ee0045c1c21e598eae830126bb Mon Sep 17 00:00:00 2001 From: Stepan Krapivin Date: Tue, 7 Nov 2017 13:22:39 +0500 Subject: [PATCH] add is_ordered field to DTYSModel --- dtys/migrations/0002_auto_20171103_2158.py | 65 ++++++++++++++++++++++ dtys/models.py | 1 + dtys/tasks.py | 3 +- 3 files changed, 68 insertions(+), 1 deletion(-) create mode 100644 dtys/migrations/0002_auto_20171103_2158.py diff --git a/dtys/migrations/0002_auto_20171103_2158.py b/dtys/migrations/0002_auto_20171103_2158.py new file mode 100644 index 0000000..e976bba --- /dev/null +++ b/dtys/migrations/0002_auto_20171103_2158.py @@ -0,0 +1,65 @@ +# -*- coding: utf-8 -*- +# Generated by Django 1.9.3 on 2017-11-03 21:58 +from __future__ import unicode_literals + +from django.db import migrations, models + + +class Migration(migrations.Migration): + + dependencies = [ + ('dtys', '0001_initial'), + ] + + operations = [ + migrations.AddField( + model_name='dtysmodel', + name='is_ordered', + field=models.BooleanField(default=False, verbose_name='Заказан'), + ), + migrations.AlterField( + model_name='dtysmodel', + name='end_date', + field=models.DateField(verbose_name='Дата окончания'), + ), + migrations.AlterField( + model_name='dtysmodel', + name='end_time', + field=models.TimeField(verbose_name='Время окончания'), + ), + migrations.AlterField( + model_name='dtysmodel', + name='is_public', + field=models.BooleanField(default=False, verbose_name='Опубликован'), + ), + migrations.AlterField( + model_name='dtysmodel', + name='is_stopped', + field=models.BooleanField(default=False, verbose_name='Остановлен'), + ), + migrations.AlterField( + model_name='dtysmodel', + name='price_end', + field=models.IntegerField(verbose_name='Конечная цена (минимальная)'), + ), + migrations.AlterField( + model_name='dtysmodel', + name='price_start', + field=models.IntegerField(verbose_name='Начальная цена'), + ), + migrations.AlterField( + model_name='dtysmodel', + name='price_stopped', + field=models.IntegerField(default=0, verbose_name='Прайс заказа'), + ), + migrations.AlterField( + model_name='dtysmodel', + name='start_date', + field=models.DateField(verbose_name='Дата начала'), + ), + migrations.AlterField( + model_name='dtysmodel', + name='start_time', + field=models.TimeField(verbose_name='Время начала'), + ), + ] diff --git a/dtys/models.py b/dtys/models.py index 9d7d694..7d1e4a1 100644 --- a/dtys/models.py +++ b/dtys/models.py @@ -30,6 +30,7 @@ class DTYSModel(models.Model): is_stopped = models.BooleanField(verbose_name="Остановлен", default=False) is_public = models.BooleanField(verbose_name="Опубликован", default=False) + is_ordered = models.BooleanField(verbose_name="Заказан", default=False) @property def end_datetime(self): diff --git a/dtys/tasks.py b/dtys/tasks.py index 0e3479d..f055a1e 100644 --- a/dtys/tasks.py +++ b/dtys/tasks.py @@ -7,4 +7,5 @@ app = Celery('tasks', broker='redis://localhost:6379/0') def return_dtys(dtys_id): from .models import DTYSModel - DTYSModel.objects.filter(id=dtys_id).update(is_stopped=False) + DTYSModel.objects.filter( + id=dtys_id, is_ordered=False).update(is_stopped=False)