From f56be13e7feacdc8a8742ac726847c9da9bee41c Mon Sep 17 00:00:00 2001 From: spacenergy Date: Wed, 2 Mar 2016 09:55:49 +0600 Subject: [PATCH] auto --- accounts/admin.py | 2 +- batiskaf/settings.py | 2 +- batiskaf/urls.py | 5 ++--- requirements.txt | 8 ++++++-- store/models.py | 1 - 5 files changed, 10 insertions(+), 8 deletions(-) diff --git a/accounts/admin.py b/accounts/admin.py index 1841f2c..d443056 100644 --- a/accounts/admin.py +++ b/accounts/admin.py @@ -34,7 +34,7 @@ class ProfileCreationForm(forms.ModelForm): class ProfileChangeForm(forms.ModelForm): password = ReadOnlyPasswordHashField( label= ("Password"), - help_text= ("ИЗМЕНИТЬ ПАРОЛЬ")) + help_text= ("ИЗМЕНИТЬ ПАРОЛЬ")) class Meta: model = Profile diff --git a/batiskaf/settings.py b/batiskaf/settings.py index 3cab1fc..8e35fa9 100644 --- a/batiskaf/settings.py +++ b/batiskaf/settings.py @@ -59,7 +59,7 @@ INSTALLED_APPS = ( 'django.contrib.postgres', 'django.contrib.sitemaps', 'django.contrib.sites', - 'django_extensions', + #'django_extensions', 'rest_framework', 'easy_thumbnails', 'bootstrapform_jinja', diff --git a/batiskaf/urls.py b/batiskaf/urls.py index aa087ac..e0d0459 100644 --- a/batiskaf/urls.py +++ b/batiskaf/urls.py @@ -65,13 +65,12 @@ sitemaps1 = { 'categories': CategorySitemap, } -urlpatterns = patterns( - '', +urlpatterns = ( url(r'^$', 'main.views.index', name='index'), url(r'^sitemap\.xml$', sitemap, {'sitemaps': sitemaps1}, name='django.contrib.sitemaps.views.sitemap'), - (r'^robots\.txt$', lambda r: HttpResponse( + url(r'^robots\.txt$', lambda r: HttpResponse( "User-agent: *\nDisallow: \nHost: batiskaf-kz.kz\nSitemap: http://batiskaf-kz.kz/sitemap.xml", content_type="text/plain")), url(r'^size/$', 'main.views.size_index', diff --git a/requirements.txt b/requirements.txt index f8dd322..2f5b162 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,7 +1,7 @@ +awesome-slugify==1.6.5 cffi==1.1.2 cryptography==0.9.3 -Django==1.8.3 -django-extensions==1.5.5 +Django==1.9.3 django-jinja==1.4.1 django-jinja-bootstrap-form==4.0.3 djangorestframework==3.1.3 @@ -11,6 +11,7 @@ idna==2.0 jedi==0.9.0 Jinja2==2.8 kkb==0.6 +lxml==3.5.0 MarkupSafe==0.23 pbr==1.3.0 Pillow==2.9.0 @@ -21,11 +22,14 @@ pyasn1==0.1.8 pycparser==2.14 Pygments==2.0.2 pyOpenSSL==0.15.1 +regex==2015.9.23 requests==2.7.0 six==1.9.0 stevedore==1.6.0 +Unidecode==0.4.18 virtualenv==13.1.0 virtualenv-clone==0.2.6 virtualenvwrapper==4.6.0 wcwidth==0.1.4 wheel==0.24.0 +xmljson==0.1.5 diff --git a/store/models.py b/store/models.py index 49d9e98..cd7386f 100644 --- a/store/models.py +++ b/store/models.py @@ -263,7 +263,6 @@ class ProductVariation(models.Model): if profile and profile.is_authenticated() and self.product.brand.slug in ['beuchat', 'scorpena']: return int(self.price - (self.price / Decimal(100) * Decimal(profile.sale))) else: - print(profile) if self.discount: return int(self.price - (self.price / 100 * self.discount)) else: