fix problem with register confirmation

.gitignore

@@ -33,6 +33,7 @@ __pycache__/
 # Distribution / packaging
 .Python
 env/
+venv/
 build/
 develop-eggs/
 dist/
@@ -77,17 +78,17 @@ docs/_build/
 target/
 
 
-### Django ###
+### Project ###
 *.log
 *.pot
 *.pyc
 __pycache__/
-assets/
+**/node_modules/**
-node_modules/
 package-lock.json
 development.py
-*/migrations/*
+static/
-
+client/node_modules/*
+client/dist/*
 
 .env
 db.sqlite3

README.md

@@ -8,27 +8,58 @@
 ---
 
 ### Server configuration
-1. Use systemd file with name gunicorn-eshop.service to initialize gunicorn server with DJANGO_SETTINGS_MODULE environment var
+1. Install necessary packages:
-2. Use systemd file with name celery-eshop.service to initialize celery following with these [instructions](http://docs.celeryproject.org/en/latest/userguide/daemonizing.html#usage-systemd "Celery | Daemonization")
+```bash
-2. Install virtualenv inside the project directory in run server
+sudo apt-get install -y libpq-dev postgresql nginx virtualenv
-3. Install dependencies from inside the activated virtualenv
+curl -sL https://deb.nodesource.com/setup_10.x | sudo -E bash -
-4. Create empty logs dir in project directory
+sudo apt-get install -y nodejs
-5. Install nodejs with npm(nvm preferably)
+```
-6. install all packages
+
+2. Create database:
+```bash
+CREATE DATABASE eshop_db;
+CREATE USER eshop_admin WITH password '12345678';
+GRANT ALL ON DATABASE eshop_db TO eshop_admin;
+
+# Allow user to create db for running django tests
+
+ALTER USER eshop_admin CREATEDB;
+```
+
+3. Install virtualenv inside the project directory and activate it:
+```bash
+virtualenv --python3=$(which python3) venv
+source venv/bin/activate
+```
+
+4. Use systemd file with name gunicorn-eshop.service to initialize gunicorn server with DJANGO_SETTINGS_MODULE environment var
+5. Use systemd file with name celery-eshop.service to initialize celery following with these [instructions](http://docs.celeryproject.org/en/latest/userguide/daemonizing.html#usage-systemd "Celery | Daemonization")
+6. Install dependencies from inside the activated virtualenv:
+```bash
+pip install -r requirements.txt
+```
+
+7. Install all packages from package.json in the client/ directory and run webpack
+```bash
+npm i
+npm run dev
+```
+
+8. Create empty logs dir in project directory
+
 
 ###Development
 
-1. Activate eshop environment using virtualenvwrapper(workon)
+1. Activate eshop environment using virtualenv
 2. Make .env file with the structure described in .env.sample file
 3. Make migrations for modules: auth, accounts_ext, etc.
 4. Start celery queue for tasks with the command:  
    `celery -A eshop_project worker -l info --pool=eventlet`
-5. Make alias for gulp with alias command and path gulp executable file
+
-6. Run `gulp default`
 
 ###Deployment
 
-1. Activate eshop environment using virtualenvwrapper(workon)
+1. Activate eshop environment using virtualenv
 2. Make pull request from bitbucket repo by ssh using passphrase
 3. Make .env file with the structure described in .env.sample file
 4. Make migrations for modules
@@ -36,4 +67,5 @@
 6. Restart gunicorn-eshop and celery-eshop daemons in systemd
 7. Load fixture core fixture sites to configure site domain (before the FIRST http request)
 
+8. Add corresponding entry to django_site table
 

accounts_ext/fixtures/accounts.json

@@ -1 +0,0 @@
-[{"model": "accounts_ext.user", "pk": 1, "fields": {"password": "pbkdf2_sha256$100000$AAP4DpqYKrFB$mQRKz7qi/1va3Zoh2O3g9j7wYKCBaMLz5LFrbszDNLA=", "last_login": "2018-08-12T20:46:54Z", "create_at": "2018-08-12T20:46:44.961Z", "updated_at": "2018-08-12T20:47:05.733Z", "status": 25, "is_superuser": true, "username": "dimkasp", "email": "dimkasp@mail.ru", "referral_user": null, "confirmed_at": null, "groups": [], "user_permissions": []}}]

client/asserts/css/jquery.rating.css

@@ -0,0 +1,93 @@
+
+.br-theme-css-stars .br-widget {
+    height: 28px;
+    white-space: nowrap
+}
+
+.br-theme-css-stars .br-widget a {
+    text-decoration: none;
+    height: 18px;
+    width: 18px;
+    float: left;
+    font-size: 23px;
+    margin-right: 5px
+}
+
+.br-theme-css-stars .br-widget a:after {
+    content: "\2605";
+    color: #d2d2d2
+}
+
+.br-theme-css-stars .br-widget a.br-active:after {
+    color: #edb867
+}
+
+.br-theme-css-stars .br-widget a.br-selected:after {
+    color: #edb867
+}
+
+.br-theme-css-stars .br-widget .br-current-rating {
+    display: none
+}
+
+.br-theme-css-stars .br-readonly a {
+    cursor: default
+}
+
+@media print {
+    .br-theme-css-stars .br-widget a:after {
+        content: "\2606";
+        color: #000
+    }
+
+    .br-theme-css-stars .br-widget a.br-active:after, .br-theme-css-stars .br-widget a.br-selected:after {
+        content: "\2605";
+        color: #000
+    }
+}
+
+.br-theme-fontawesome-stars .br-widget {
+    height: 28px;
+    white-space: nowrap
+}
+
+.br-theme-fontawesome-stars .br-widget a {
+    font: normal normal normal 20px/1 FontAwesome;
+    text-rendering: auto;
+    -webkit-font-smoothing: antialiased;
+    text-decoration: none;
+    margin-right: 2px
+}
+
+.br-theme-fontawesome-stars .br-widget a:after {
+    content: '\f005';
+    color: #d2d2d2
+}
+
+.br-theme-fontawesome-stars .br-widget a.br-active:after {
+    color: #edb867
+}
+
+.br-theme-fontawesome-stars .br-widget a.br-selected:after {
+    color: #edb867
+}
+
+.br-theme-fontawesome-stars .br-widget .br-current-rating {
+    display: none
+}
+
+.br-theme-fontawesome-stars .br-readonly a {
+    cursor: default
+}
+
+@media print {
+    .br-theme-fontawesome-stars .br-widget a:after {
+        content: '\f006';
+        color: #000
+    }
+
+    .br-theme-fontawesome-stars .br-widget a.br-active:after, .br-theme-fontawesome-stars .br-widget a.br-selected:after {
+        content: '\f005';
+        color: #000
+    }
+}

client/asserts/js/common.js

@@ -49,13 +49,6 @@
         });
 
 
-        // Magnific popup
-        $('.certificate__item').magnificPopup({
-            type: 'image'
-            // other options
-        });
-
-
         // звезды
         var stars = $('.stars');
         stars.barrating({

client/index.js

@@ -0,0 +1,16 @@
+import "./asserts/css/main.css";
+import './node_modules/jquery-ui-dist/jquery-ui.min.css';
+import "./node_modules/bootstrap/dist/css/bootstrap.min.css";
+
+import './node_modules/jquery/dist/jquery.js';
+import './node_modules/jquery-ui-dist/jquery-ui.js';
+import './node_modules/magnific-popup/dist/jquery.magnific-popup.js';
+import './node_modules/jquery-bar-rating/dist/jquery.barrating.min.js';
+import './node_modules/bootstrap/dist/js/bootstrap.js';
+import './node_modules/jquery-autocomplete/jquery.autocomplete.js';
+
+import "./asserts/js/ajax.js";
+import "./asserts/js/basket.tools.js";
+import "./asserts/js/common.js";
+import "./asserts/js/our_search_code.js";
+

client/package.json

@@ -0,0 +1,29 @@
+{
+  "name": "eshop",
+  "version": "1.0.0",
+  "description": "",
+  "main": "index.js",
+  "scripts": {
+    "test": "echo \"Error: no test specified\" && exit 1",
+    "dev": "webpack --mode=development --watch",
+    "build": "webpack --mode=production"
+  },
+  "author": "FUNNYDMAN",
+  "license": "ISC",
+  "devDependencies": {
+    "webpack": "^4.25.1",
+    "webpack-cli": "^3.1.2",
+    "css-loader": "^1.0.1",
+    "extract-text-webpack-plugin": "^4.0.0-beta.0",
+    "file-loader": "^2.0.0",
+    "style-loader": "^0.23.1"
+  },
+  "dependencies": {
+    "bootstrap": "3.3.7",
+    "jquery": "^3.3.1",
+    "jquery-autocomplete": "^1.2.8",
+    "jquery-bar-rating": "^1.2.2",
+    "jquery-ui-dist": "1.12.1",
+    "magnific-popup": "^1.1.0"
+  }
+}

client/webpack.config.js

@@ -0,0 +1,48 @@
+const path = require('path');
+const ExtractTextPlugin = require('extract-text-webpack-plugin');
+const webpack = require('webpack');
+
+module.exports = {
+    entry: './index.js',
+    output: {
+        filename: './js/build-min.js',
+        path: path.resolve(__dirname, 'dist')
+    },
+    module: {
+        rules: [{
+            test: /\.(css)$/,
+            use: ExtractTextPlugin.extract({
+                fallback: 'style-loader',
+                use: ['css-loader']
+            })
+        },
+            {
+                test: /\.(png|svg|jpg|gif|jpeg)$/,
+                use: [
+                    {
+                        loader: 'file-loader',
+                        options: {outputPath: 'img/'}
+                    }
+                ]
+            }, {
+                test: /\.(woff(2)?|ttf|eot)(\?v=\d+\.\d+\.\d+)?$/,
+                use: [
+                    {
+                        loader: 'file-loader',
+                        options: {
+                            name: '[name].[ext]',
+                            outputPath: 'fonts/'
+                        }
+                    }
+                ]
+            }
+        ]
+    },
+    plugins: [
+        new ExtractTextPlugin("css/build.css"),
+        new webpack.ProvidePlugin({
+            $: "jquery",
+            jQuery: "jquery"
+        })
+    ]
+};

deployment/eshop.conf

@@ -0,0 +1,11 @@
+    server {
+        server_name name_or_ip;
+        listen 80;
+         location / {
+            proxy_pass http://localhost:8000;
+        }
+
+        location /static/ {
+            root path_to_static_files;
+        }
+    }

eshop/accounts_ext/admin.py

@@ -1,7 +1,7 @@
 from django.contrib import admin
 from django.contrib.auth import get_user_model
-from django.contrib.auth.models import Group as GroupBase
 from django.contrib.auth.admin import UserAdmin as BaseUserAdmin, GroupAdmin
+from django.contrib.auth.models import Group as GroupBase
 from django.urls import reverse_lazy
 from django.utils.translation import ugettext_lazy as _
 from import_export import resources
@@ -9,8 +9,7 @@ from jet.filters import DateRangeFilter
 from rangefilter.filter import DateTimeRangeFilter
 
 from core.admin import SafeModelAdmin
-# from referral.admin import ReferralAdminInline
+from referral.admin import ReferralAdminInline
-
 from .forms import UserChangeForm, UserCreationForm
 from .models import Profile, Company, Group
 
@@ -27,7 +26,7 @@ class CustomUserResource(resources.ModelResource):
 @admin.register(get_user_model())
 class UserAdmin(SafeModelAdmin, BaseUserAdmin):
     inlines = (
-        # ReferralAdminInline,
+        ReferralAdminInline,
     )
 
     fieldsets = (

eshop/accounts_ext/fixtures/accounts.json

@@ -0,0 +1,20 @@
+[
+  {
+    "model": "accounts_ext.user",
+    "pk": 1,
+    "fields": {
+      "password": "pbkdf2_sha256$100000$AAP4DpqYKrFB$mQRKz7qi/1va3Zoh2O3g9j7wYKCBaMLz5LFrbszDNLA=",
+      "last_login": "2018-08-12T20:46:54Z",
+      "create_at": "2018-08-12T20:46:44.961Z",
+      "updated_at": "2018-08-12T20:47:05.733Z",
+      "status": 25,
+      "is_superuser": true,
+      "username": "dimkasp",
+      "email": "dimkasp@mail.ru",
+      "referral_user": null,
+      "confirmed_at": null,
+      "groups": [],
+      "user_permissions": []
+    }
+  }
+]

eshop/accounts_ext/forms.py

@@ -1,13 +1,9 @@
 import logging
+
 from crispy_forms.helper import FormHelper
 from crispy_forms.layout import Layout, Field, Div, Submit, HTML
 from django import forms
-from django.conf import settings
 from django.contrib.auth import get_user_model, password_validation
-from django.urls import reverse, reverse_lazy
-from django.utils.translation import ugettext_lazy as _
-from django_email_blacklist import DisposableEmailChecker
-from registration.forms import RegistrationFormUniqueEmail
 from django.contrib.auth.forms import (
     AuthenticationForm as AuthenticationFormBase,
     PasswordResetForm as PasswordResetFormBase,
@@ -16,6 +12,10 @@ from django.contrib.auth.forms import (
     UserCreationForm as UserCreationFormBase
 )
 from django.contrib.auth.forms import UsernameField
+from django.urls import reverse, reverse_lazy
+from django.utils.translation import ugettext_lazy as _
+from django_email_blacklist import DisposableEmailChecker
+from registration.forms import RegistrationFormUniqueEmail
 from snowpenguin.django.recaptcha2.fields import ReCaptchaField
 from snowpenguin.django.recaptcha2.widgets import ReCaptchaWidget
 
@@ -56,6 +56,11 @@ class RegistrationForm(RegistrationFormUniqueEmail):
             raise forms.ValidationError(_('Введите email с валидными доменом'))
         return email
 
+    def clean(self):
+        if not self.cleaned_data['captcha']:
+            raise forms.ValidationError(_("Проверьте правильности капчи"))
+        return self.cleaned_data
+
     def save(self, commit=True):
         user = super().save(commit)
         profile = Profile.objects.filter(user=user).first()

eshop/accounts_ext/migrations/0001_initial.py

@@ -0,0 +1,110 @@
+# Generated by Django 2.0.7 on 2018-10-25 15:27
+
+from django.conf import settings
+import django.contrib.auth.models
+import django.core.validators
+from django.db import migrations, models
+import django.db.models.deletion
+
+
+class Migration(migrations.Migration):
+
+    initial = True
+
+    dependencies = [
+        ('auth', '0009_alter_user_last_name_max_length'),
+        ('core', '0001_initial'),
+    ]
+
+    operations = [
+        migrations.CreateModel(
+            name='User',
+            fields=[
+                ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
+                ('password', models.CharField(max_length=128, verbose_name='password')),
+                ('last_login', models.DateTimeField(blank=True, null=True, verbose_name='last login')),
+                ('create_at', models.DateTimeField(auto_now_add=True, verbose_name='создан в')),
+                ('updated_at', models.DateTimeField(auto_now=True, verbose_name='обновлен')),
+                ('status', models.SmallIntegerField(choices=[(0, 'Новый'), (25, 'Активный'), (50, 'Удаленный')], default=0, verbose_name='статус')),
+                ('is_superuser', models.BooleanField(default=False, help_text='Designates that this user has all permissions without explicitly assigning them.', verbose_name='superuser status')),
+                ('username', models.CharField(max_length=255, verbose_name='username')),
+                ('email', models.EmailField(error_messages={'unique': 'A user with that email already exists.'}, max_length=254, unique=True, verbose_name='email')),
+                ('confirmed_at', models.DateTimeField(blank=True, null=True, verbose_name='подвтержден в')),
+            ],
+            options={
+                'verbose_name': 'пользователь',
+                'verbose_name_plural': 'пользователи',
+            },
+        ),
+        migrations.CreateModel(
+            name='Company',
+            fields=[
+                ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
+                ('create_at', models.DateTimeField(auto_now_add=True, verbose_name='создан в')),
+                ('updated_at', models.DateTimeField(auto_now=True, verbose_name='обновлен')),
+                ('status', models.SmallIntegerField(choices=[(0, 'Новый'), (25, 'Активный'), (50, 'Удаленный')], default=0, verbose_name='статус')),
+                ('company_name', models.CharField(blank=True, max_length=255, null=True, verbose_name='компания')),
+                ('address', models.TextField(blank=True, null=True, verbose_name='адрес')),
+                ('inn', models.CharField(blank=True, max_length=12, null=True, verbose_name='ИНН')),
+                ('ogrn', models.CharField(blank=True, max_length=13, null=True, verbose_name='ОГРН')),
+                ('type', models.SmallIntegerField(blank=True, choices=[(25, 'Компания'), (50, 'Физ лицо')], default=25, null=True, verbose_name='тип')),
+                ('city', models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.SET_NULL, to='core.City')),
+                ('user', models.OneToOneField(on_delete=django.db.models.deletion.CASCADE, to=settings.AUTH_USER_MODEL, verbose_name='username')),
+            ],
+            options={
+                'verbose_name': 'компания',
+                'verbose_name_plural': 'компании',
+            },
+        ),
+        migrations.CreateModel(
+            name='Profile',
+            fields=[
+                ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
+                ('create_at', models.DateTimeField(auto_now_add=True, verbose_name='создан в')),
+                ('updated_at', models.DateTimeField(auto_now=True, verbose_name='обновлен')),
+                ('status', models.SmallIntegerField(choices=[(0, 'Новый'), (25, 'Активный'), (50, 'Удаленный')], default=0, verbose_name='статус')),
+                ('first_name', models.CharField(blank=True, max_length=100, null=True, verbose_name='first name')),
+                ('last_name', models.CharField(blank=True, max_length=100, null=True, verbose_name='last name')),
+                ('patronymic', models.CharField(blank=True, max_length=100, null=True, verbose_name='отчество')),
+                ('birthday', models.DateField(blank=True, null=True, verbose_name='дата рождения')),
+                ('phone', models.CharField(blank=True, max_length=12, null=True, validators=[django.core.validators.RegexValidator(message="Phone number must be entered in the format: '+99999999999'. Up to 12 digits allowed.", regex='^\\((+7)|8)?\\d{10}$')], verbose_name='телефон')),
+                ('address', models.TextField(verbose_name='aдрес')),
+                ('city', models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.SET_NULL, to='core.City', verbose_name='город')),
+                ('user', models.OneToOneField(on_delete=django.db.models.deletion.CASCADE, to=settings.AUTH_USER_MODEL, verbose_name='username')),
+            ],
+            options={
+                'verbose_name': 'профиль',
+                'verbose_name_plural': 'профили',
+            },
+        ),
+        migrations.CreateModel(
+            name='Group',
+            fields=[
+            ],
+            options={
+                'verbose_name': 'группа',
+                'verbose_name_plural': 'группы',
+                'proxy': True,
+                'indexes': [],
+            },
+            bases=('auth.group',),
+            managers=[
+                ('objects', django.contrib.auth.models.GroupManager()),
+            ],
+        ),
+        migrations.AddField(
+            model_name='user',
+            name='groups',
+            field=models.ManyToManyField(blank=True, help_text='The groups this user belongs to. A user will get all permissions granted to each of their groups.', related_name='user_set', related_query_name='user', to='auth.Group', verbose_name='groups'),
+        ),
+        migrations.AddField(
+            model_name='user',
+            name='referral_user',
+            field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.SET_NULL, to=settings.AUTH_USER_MODEL, verbose_name='Реферальный пользователь'),
+        ),
+        migrations.AddField(
+            model_name='user',
+            name='user_permissions',
+            field=models.ManyToManyField(blank=True, help_text='Specific permissions for this user.', related_name='user_set', related_query_name='user', to='auth.Permission', verbose_name='user permissions'),
+        ),
+    ]

eshop/accounts_ext/models.py

@@ -6,9 +6,8 @@ from django.core.validators import RegexValidator
 from django.db import models
 from django.db.models.signals import post_save
 from django.dispatch import receiver
-from django.utils.translation import ugettext_lazy as _
 from django.utils.timezone import now as datetime_now
-
+from django.utils.translation import ugettext_lazy as _
 from registration.signals import user_activated
 
 from core.models import (
@@ -18,8 +17,6 @@ from core.models import (
 )
 
 
-# Create your models here.
-
 class UserManager(ActualOnlyManager, BaseUserManager):
     def create_superuser(self, email, password):
         user = self.model(

eshop/accounts_ext/templatetags/accounts_ext_filters.py

@@ -2,6 +2,7 @@ from django.template import Library
 
 register = Library()
 
+
 @register.simple_tag(name='get')
 def get_by_key(dict, key):
     return getattr(dict, key)

eshop/accounts_ext/urls.py

@@ -1,6 +1,6 @@
 from django.urls import re_path
-from . import views
 
+from . import views
 
 urlpatterns = [
     re_path(r'^login/$', views.LoginView.as_view(), name='login'),
@@ -9,6 +9,7 @@ urlpatterns = [
     re_path(r'^register/done/$', views.RegistrationDoneView.as_view(), name='register_done'),
     re_path(r'^password/reset/$', views.ResetPasswordView.as_view(), name='reset_password'),
     re_path(r'^password/reset/done/$', views.ResetPasswordDoneView.as_view(), name='reset_password_done'),
-    re_path(r'^password/reset/change/(?P<uidb64>[0-9A-Za-z_\-]+)/(?P<token>.+)/$', views.ResetPasswordConfirmView.as_view(), name='reset_password_change'),
+    re_path(r'^password/reset/change/(?P<uidb64>[0-9A-Za-z_\-]+)/(?P<token>.+)/$',
+            views.ResetPasswordConfirmView.as_view(), name='reset_password_change'),
     re_path(r'^password/reset/complete/$', views.ResetPasswordCompleteView.as_view(), name='reset_password_complete')
 ]

eshop/accounts_ext/views.py

@@ -1,6 +1,6 @@
 import logging
+
 from django.conf import settings
-from django.contrib.auth.forms import SetPasswordForm
 from django.contrib.auth.views import (
     LoginView as LoginViewBase,
     LogoutView,
@@ -9,29 +9,26 @@ from django.contrib.auth.views import (
     PasswordResetConfirmView as PasswordResetConfirmViewBase,
     PasswordResetCompleteView as PasswordResetCompleteViewBase,
 )
+from django.shortcuts import redirect, resolve_url
+from django.urls import reverse_lazy
+from django.utils.http import is_safe_url, urlencode
+from django.utils.translation import ugettext_lazy as _
 from django.views.generic import TemplateView
-
 from registration.backends.default.views import (
     RegistrationView as RegistrationViewBase,
     ResendActivationView as ResendActivationViewBase
 )
-from django.contrib.messages.views import SuccessMessageMixin
-from django.shortcuts import redirect, resolve_url
-from django.urls import reverse_lazy
-from django.utils.http import is_safe_url, urlencode
-from django.utils.translation import ugettext_lazy as _
 
 from core.views import ProtectedTemplateView
 from .forms import (
     PasswordResetRequestForm, SetPasswordForm, RegistrationCompanyForm,
     AuthenticationForm,
-    RegistrationForm)
+    RegistrationForm
+)
 
 logger = logging.getLogger(__name__)
 
 
-# Create your views here.
-
 class LoginView(LoginViewBase):
     redirect_field_name = 'next'
     form_class = AuthenticationForm
@@ -152,7 +149,7 @@ class RegistrationDoneView(TemplateView):
 
 
 class ResendActivationView(ResendActivationViewBase):
-    template_name = 'registration/resend_activation.tml'
+    template_name = 'registration/resend_activation.html'
 
     def get_context_data(self, **kwargs):
         context = super().get_context_data(**kwargs)

eshop/blog_ext/admin.py

@@ -1,14 +1,11 @@
+from ckeditor_uploader.widgets import CKEditorUploadingWidget
 from django.contrib import admin
 from django.utils.translation import ugettext_lazy as _
-
-from ckeditor_uploader.widgets import CKEditorUploadingWidget
-
 from pinax.blog.admin import (
     PostAdmin as BasePostAdmin,
     SectionAdmin as BaseSectionAdmin,
     PostImageSet as BasePostImageSet
 )
-
 from pinax.blog.models import (
     Post as PinaxPost,
     Section as PinaxSection,
@@ -60,7 +57,6 @@ class PostImageSet(ImageSet):
         verbose_name_plural = _('Изображения')
 
 
-
 admin.site.unregister(BasePostImageSet)
 
 admin.site.register(

eshop/blog_ext/forms.py

@@ -1,6 +1,5 @@
 from django.forms import forms
 from django.utils.translation import ugettext_lazy as _
-
 from pinax.blog.forms import AdminPostForm as BaseAdminPostForm
 
 from blog_ext.models import Post

eshop/blog_ext/migrations/0001_initial.py

@@ -0,0 +1,93 @@
+# Generated by Django 2.0.7 on 2018-10-25 15:27
+
+import blog_ext.models
+from django.db import migrations, models
+import django.db.models.deletion
+
+
+class Migration(migrations.Migration):
+
+    initial = True
+
+    dependencies = [
+        ('blog', '0001_initial'),
+        ('pinax_images', '0001_initial'),
+    ]
+
+    operations = [
+        migrations.CreateModel(
+            name='ImageSet',
+            fields=[
+                ('imageset_ptr', models.OneToOneField(auto_created=True, on_delete=django.db.models.deletion.CASCADE, parent_link=True, primary_key=True, serialize=False, to='pinax_images.ImageSet')),
+                ('create_at', models.DateTimeField(auto_now_add=True, verbose_name='создан в')),
+                ('updated_at', models.DateTimeField(auto_now=True, verbose_name='обновлен')),
+            ],
+            options={
+                'verbose_name': 'Коллаж',
+                'verbose_name_plural': 'Коллажи',
+            },
+            bases=('pinax_images.imageset', models.Model),
+        ),
+        migrations.CreateModel(
+            name='Post',
+            fields=[
+                ('post_ptr', models.OneToOneField(auto_created=True, on_delete=django.db.models.deletion.CASCADE, parent_link=True, primary_key=True, serialize=False, to='blog.Post')),
+                ('create_at', models.DateTimeField(auto_now_add=True, verbose_name='создан в')),
+                ('updated_at', models.DateTimeField(auto_now=True, verbose_name='обновлен')),
+                ('status', models.SmallIntegerField(choices=[(0, 'Новый'), (25, 'Активный'), (50, 'Удаленный')], default=0, verbose_name='статус')),
+                ('preview_image', models.FileField(blank=True, null=True, upload_to=blog_ext.models.Post.upload_file_to, verbose_name='Превью изображение')),
+            ],
+            options={
+                'verbose_name': 'Пост',
+                'verbose_name_plural': 'Посты',
+            },
+            bases=('blog.post', models.Model),
+        ),
+        migrations.CreateModel(
+            name='ReviewComment',
+            fields=[
+                ('reviewcomment_ptr', models.OneToOneField(auto_created=True, on_delete=django.db.models.deletion.CASCADE, parent_link=True, primary_key=True, serialize=False, to='blog.ReviewComment')),
+            ],
+            options={
+                'verbose_name': 'Комментарий',
+                'verbose_name_plural': 'Комментарий',
+            },
+            bases=('blog.reviewcomment',),
+        ),
+        migrations.CreateModel(
+            name='Revision',
+            fields=[
+                ('revision_ptr', models.OneToOneField(auto_created=True, on_delete=django.db.models.deletion.CASCADE, parent_link=True, primary_key=True, serialize=False, to='blog.Revision')),
+            ],
+            options={
+                'verbose_name': 'Ревизия',
+                'verbose_name_plural': 'Ревизии',
+            },
+            bases=('blog.revision',),
+        ),
+        migrations.CreateModel(
+            name='Section',
+            fields=[
+                ('section_ptr', models.OneToOneField(auto_created=True, on_delete=django.db.models.deletion.CASCADE, parent_link=True, primary_key=True, serialize=False, to='blog.Section')),
+                ('create_at', models.DateTimeField(auto_now_add=True, verbose_name='создан в')),
+                ('updated_at', models.DateTimeField(auto_now=True, verbose_name='обновлен')),
+            ],
+            options={
+                'verbose_name': 'Секция',
+                'verbose_name_plural': 'Секции',
+            },
+            bases=('blog.section', models.Model),
+        ),
+        migrations.CreateModel(
+            name='PostImageSet',
+            fields=[
+            ],
+            options={
+                'verbose_name': 'Изображение',
+                'verbose_name_plural': 'Изображения',
+                'proxy': True,
+                'indexes': [],
+            },
+            bases=('blog_ext.imageset',),
+        ),
+    ]

eshop/blog_ext/models.py

@@ -1,11 +1,8 @@
-import uuid
-
 import pytz
 from django.conf import settings
 from django.db import models
 from django.urls import reverse_lazy
 from django.utils.translation import ugettext_lazy as _
-
 # Create your models here.
 from pinax.blog.models import (
     Post as BasePost,
@@ -14,9 +11,7 @@ from pinax.blog.models import (
     Section as BaseSection
 )
 from pinax.images.models import (
-    ImageSet as BaseImageSet,
+    ImageSet as BaseImageSet)
-    Image as BaseImage,
-    image_upload_to)
 
 from core.models import AbstractStatusModel, AbstractDateTimeModel
 

eshop/blog_ext/urls.py

@@ -1,6 +1,6 @@
 from django.urls import re_path
-from . import views
 
+from . import views
 
 urlpatterns = [
     re_path(r"^$", views.BlogIndexView.as_view(), name="blog"),

eshop/blog_ext/views.py

@@ -5,6 +5,7 @@ from pinax.blog.views import (
     SecretKeyPostDetailView as BaseSecretKeyPostDetailView,
     SlugUniquePostDetailView as BaseSlugUniquePostDetailView)
 
+
 class SlugUniquePostDetailView(BaseSlugUniquePostDetailView):
     pass
 

eshop/cabinet/views.py

@@ -1,9 +1,8 @@
-from django.conf import settings
 from django.core.paginator import Paginator
 from django.utils.translation import ugettext_lazy as _
 
 # Create your views here.
-# from cart.models import BUYING_STATUS_PAID
+from cart.models import BUYING_STATUS_PAID
 from core.views import ProtectedTemplateView
 
 
@@ -11,20 +10,20 @@ class IndexTemplateView(ProtectedTemplateView):
     template_name = 'cabinet/index.html'
     title = _('Личный кабинет')
 
-    # def get_ref_link(self,user):
+    def get_ref_link(self, user):
-    #     return "{path}?ref={ref_link}".format(**{
+        return "{path}?ref={ref_link}".format(**{
-    #         'path': user.referral.url,
+            'path': user.referral.url,
-    #         'ref_link': user.referral.code
+            'ref_link': user.referral.code
-    #     })
+        })
-
+
-    # def get_bought_item_list(self,user):
+    def get_bought_item_list(self, user):
-    #     bought_item_queryset = user.buying_set.filter(status=BUYING_STATUS_PAID).order_by('-create_at').all()
+        bought_item_queryset = user.buying_set.filter(status=BUYING_STATUS_PAID).order_by('-create_at').all()
-    #     paginator = Paginator(
+        paginator = Paginator(
-    #         object_list=bought_item_queryset,
+            object_list=bought_item_queryset,
-    #         per_page=5
+            per_page=5
-    #     )
+        )
-    #     the_page = 1
+        the_page = 1
-    #     return paginator.page(the_page)
+        return paginator.page(the_page)
 
     def get_full_name(self, user):
         return '{last_name} {first_name} {patronymic}'.format(**{
@@ -33,18 +32,18 @@ class IndexTemplateView(ProtectedTemplateView):
             'patronymic': user.profile.patronymic or ""
         })
 
-    # def get_user_points(self,user):
+    def get_user_points(self, user):
-    #     return user.referral.referralstats.points
+        return user.referral.referralstats.points
 
     def get_context_data(self, **kwargs):
         context = super().get_context_data(**kwargs)
         context['title'] = self.title
-        # context['ref_link'] = self.get_ref_link(self.request.user)
+        context['ref_link'] = self.get_ref_link(self.request.user)
-        # context['bought_item_list'] = self.get_bought_item_list(self.request.user)
+        context['bought_item_list'] = self.get_bought_item_list(self.request.user)
         context['full_name'] = self.get_full_name(self.request.user)
         context['email'] = self.request.user.email
         context['phone_number'] = self.request.user.profile.phone
         context['company'] = self.request.user.company or None
         context['profile'] = self.request.user.profile or None
-        # context['referral_points'] = self.get_user_points(user=self.request.user)
+        context['referral_points'] = self.get_user_points(user=self.request.user)
         return context

eshop/cart/admin.py

@@ -1,25 +1,23 @@
 import csv
 import datetime
-import pytils
-import weasyprint
 from decimal import Decimal
 
+import pytils
+import weasyprint
 from django.conf import settings
 from django.contrib import admin
-from django.utils.translation import ugettext_lazy as _
 from django.http import HttpResponse
 from django.template.loader import render_to_string
-
+from django.utils.translation import ugettext_lazy as _
 from jet.admin import CompactInline
 from jet.filters import DateRangeFilter
 from rangefilter.filter import DateTimeRangeFilter
 
 from core.admin import SafeModelAdmin
-from core.models import Certificate
 from eshop_project.settings.base import PAY_REQUISITES
 from .models import (
     Offer, SupplyType,
-    Currency, Buying,
+    Buying,
     SupplyTarget,
     Order, Discount,
     Client)
@@ -32,6 +30,7 @@ class ProductOfferInlineAdmin(CompactInline):
     show_change_link = 1
     max_num = 1
 
+
 # Supply admins
 
 @admin.register(SupplyType)
@@ -84,6 +83,7 @@ class BuyingAdmin(SafeModelAdmin):
                 data_row.append(value)
             writer.writerow(data_row)
         return response
+
     export_buyings_to_csv.short_description = _('экспортировать CSV')
 
     def print_order_in_pdf(self, buyings):
@@ -96,7 +96,6 @@ class BuyingAdmin(SafeModelAdmin):
         response = HttpResponse(content_type='application/pdf')
         response['Content-Disposition'] = 'filename=order_{}.pdf'.format(buyings.id)
 
-
         weasyprint.HTML(
             string=rendered_html,
             base_url=self.request.build_absolute_uri()
@@ -107,6 +106,7 @@ class BuyingAdmin(SafeModelAdmin):
             ]
         )
         return response
+
     print_order_in_pdf.short_description = _('Распечатать заказ в pdf')
 
     def mark_buyings_as_paid(self, request, queryset):
@@ -118,8 +118,8 @@ class BuyingAdmin(SafeModelAdmin):
                 parent_profile.save()
             buying.status = BUYING_STATUS_PAID
             buying.save()
-    mark_buyings_as_paid.short_description = _('Отметить как оплаченные')
 
+    mark_buyings_as_paid.short_description = _('Отметить как оплаченные')
 
     inlines = ()
     list_display = ('user', 'offer', 'status', 'amount', 'total_price')

eshop/cart/context_processors.py

@@ -3,4 +3,3 @@ from cart.utils import Cart
 
 def cart_basket(request):
     return {'cart': Cart(request)}
-

eshop/cart/forms.py

@@ -1,25 +1,22 @@
 import uuid
 
 from crispy_forms.helper import FormHelper
-from crispy_forms.layout import Layout, Field, Div, HTML, Hidden, Fieldset, Submit
+from crispy_forms.layout import Layout, Field, Div, HTML, Submit
 from django import forms
 from django.conf import settings
 from django.core.exceptions import ValidationError
 from django.core.validators import MaxValueValidator, MinValueValidator
-from django.forms import ALL_FIELDS, formset_factory
 from django.urls import reverse_lazy
+from django.utils.translation import ugettext_lazy as _
 
 from cart.models import (
-    Buying, BUYING_STATUS_IN_CART, Offer, SupplyType, SupplyTarget, Discount, Order
+    Buying, Offer, SupplyType, SupplyTarget, Discount, Order
 )
 from cart.tasks import send_user_order_notification, send_admin_order_notification
 from contact_us.mixins import RequestNotifiable
 from core.forms import QueryFormBase
 from core.models import City
 from core.utils import parse_path
-from django.utils.translation import ugettext_lazy as _
-
-from products.models import Product
 
 
 class CartAddInlineForm(forms.ModelForm):

eshop/cart/migrations/0001_initial.py

@@ -0,0 +1,195 @@
+# Generated by Django 2.0.7 on 2018-10-25 15:27
+
+import autoslug.fields
+import cart.models
+import datetime
+from django.conf import settings
+import django.core.validators
+from django.db import migrations, models
+import django.db.models.deletion
+import django.db.models.manager
+from django.utils.timezone import utc
+
+
+class Migration(migrations.Migration):
+
+    initial = True
+
+    dependencies = [
+        ('products', '0001_initial'),
+        ('core', '0001_initial'),
+        migrations.swappable_dependency(settings.AUTH_USER_MODEL),
+    ]
+
+    operations = [
+        migrations.CreateModel(
+            name='Buying',
+            fields=[
+                ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
+                ('create_at', models.DateTimeField(auto_now_add=True, verbose_name='создан в')),
+                ('updated_at', models.DateTimeField(auto_now=True, verbose_name='обновлен')),
+                ('bonus_points', models.IntegerField(validators=[django.core.validators.MinValueValidator(0)], verbose_name='бонусы')),
+                ('status', models.SmallIntegerField(choices=[(25, 'В корзине'), (50, 'Обрабатываеться'), (75, 'Оплаченно')], default=25, verbose_name='статус')),
+                ('amount', models.SmallIntegerField(default=0, verbose_name='колличество')),
+                ('total_price', models.DecimalField(decimal_places=2, max_digits=10, verbose_name='цена')),
+            ],
+            options={
+                'verbose_name': 'Покупка',
+                'verbose_name_plural': 'Покупки',
+            },
+            managers=[
+                ('active', django.db.models.manager.Manager()),
+            ],
+        ),
+        migrations.CreateModel(
+            name='Cashback',
+            fields=[
+                ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
+                ('create_at', models.DateTimeField(auto_now_add=True, verbose_name='создан в')),
+                ('updated_at', models.DateTimeField(auto_now=True, verbose_name='обновлен')),
+                ('cashback', models.DecimalField(decimal_places=2, default=0, max_digits=7, verbose_name='Сумма')),
+                ('status', models.SmallIntegerField(choices=[(0, 'заработанный'), (100, 'потраченный')], default=0, verbose_name='статус')),
+                ('user', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to=settings.AUTH_USER_MODEL)),
+            ],
+            options={
+                'verbose_name': 'cashback',
+                'verbose_name_plural': 'cashback',
+            },
+        ),
+        migrations.CreateModel(
+            name='Client',
+            fields=[
+                ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
+                ('create_at', models.DateTimeField(auto_now_add=True, verbose_name='создан в')),
+                ('updated_at', models.DateTimeField(auto_now=True, verbose_name='обновлен')),
+                ('status', models.SmallIntegerField(choices=[(0, 'Новый'), (25, 'Активный'), (50, 'Удаленный')], default=0, verbose_name='статус')),
+                ('name', models.CharField(max_length=255, verbose_name='Название')),
+                ('image', models.FileField(upload_to=cart.models.Client.upload_file_to, verbose_name='Изображение')),
+                ('preview', models.FileField(upload_to=cart.models.Client.upload_file_to, verbose_name='Миниатюрка')),
+            ],
+            options={
+                'verbose_name': 'Клиент',
+                'verbose_name_plural': 'Клиенты',
+            },
+        ),
+        migrations.CreateModel(
+            name='Discount',
+            fields=[
+                ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
+                ('create_at', models.DateTimeField(auto_now_add=True, verbose_name='создан в')),
+                ('updated_at', models.DateTimeField(auto_now=True, verbose_name='обновлен')),
+                ('name', models.CharField(max_length=255, verbose_name='Имя')),
+                ('image', models.FileField(blank=True, null=True, upload_to=cart.models.Discount.upload_file_to, verbose_name='Изображение')),
+                ('code', models.CharField(blank=True, default='f09d1c83-a6f8-40b5-a980-c7e69f7f585c', max_length=50, unique=True, verbose_name='Код')),
+                ('valid_from', models.DateTimeField(auto_now_add=True, verbose_name='Начало')),
+                ('valid_to', models.DateTimeField(blank=True, default=datetime.datetime(2018, 11, 1, 15, 27, 27, 195955, tzinfo=utc), verbose_name='Конец')),
+                ('value', models.IntegerField(default=0, help_text='Указываем целым числом. Пример: 30 = 30%', validators=[django.core.validators.MinValueValidator(0), django.core.validators.MaxValueValidator(100)], verbose_name='Процент')),
+                ('active', models.BooleanField(default=True, verbose_name='Активная')),
+            ],
+            options={
+                'verbose_name': 'Дисконт',
+                'verbose_name_plural': 'Дисконт',
+            },
+        ),
+        migrations.CreateModel(
+            name='Offer',
+            fields=[
+                ('create_at', models.DateTimeField(auto_now_add=True, verbose_name='создан в')),
+                ('updated_at', models.DateTimeField(auto_now=True, verbose_name='обновлен')),
+                ('status', models.SmallIntegerField(choices=[(0, 'Новый'), (25, 'Активный'), (50, 'Удаленный')], default=0, verbose_name='статус')),
+                ('product', models.OneToOneField(on_delete=django.db.models.deletion.CASCADE, primary_key=True, serialize=False, to='products.Product', verbose_name='Продукт')),
+                ('vendor_code', models.CharField(help_text='Должен быть уникальным', max_length=255, unique=True, verbose_name='Артикул')),
+                ('price', models.DecimalField(decimal_places=2, help_text='Цена за продукт', max_digits=10, validators=[django.core.validators.MinValueValidator(1.0)], verbose_name='цена')),
+                ('amount', models.IntegerField(default=1, validators=[django.core.validators.MinValueValidator(1)], verbose_name='Колличество')),
+                ('cashback', models.DecimalField(decimal_places=2, default=0, help_text='Указаная сумма будет отображаться в выбранной валюте позиции', max_digits=6, verbose_name='Кешбек')),
+                ('note', models.TextField(blank=True, null=True, verbose_name='Пометка')),
+                ('account_nds', models.BooleanField(default=False, verbose_name='с учетом НДС')),
+                ('currency', models.ForeignKey(help_text='Цена по умолчанию в рублях', on_delete=django.db.models.deletion.PROTECT, to='core.Currency', verbose_name='Валюта')),
+                ('discount', models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.SET_NULL, to='cart.Discount', verbose_name='Дисконт')),
+            ],
+            options={
+                'verbose_name': 'Позиция',
+                'verbose_name_plural': 'Позиции',
+            },
+        ),
+        migrations.CreateModel(
+            name='Order',
+            fields=[
+                ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
+                ('create_at', models.DateTimeField(auto_now_add=True, verbose_name='создан в')),
+                ('updated_at', models.DateTimeField(auto_now=True, verbose_name='обновлен')),
+                ('order_code', models.CharField(max_length=255, verbose_name='код заказа')),
+                ('customer_name', models.CharField(max_length=255, verbose_name='имя')),
+                ('customer_email', models.EmailField(blank=True, default=None, max_length=254, null=True, verbose_name='email')),
+                ('phone', models.CharField(max_length=12, validators=[django.core.validators.RegexValidator(message="Phone number must be entered in the format: '+99999999999'. Up to 12 digits allowed.", regex='^((\\+7)|8)?\\d{10}$')], verbose_name='телефон')),
+                ('customer_address', models.TextField(verbose_name='адрес')),
+                ('total_price', models.DecimalField(decimal_places=2, default=0, max_digits=10, verbose_name='стоимость')),
+                ('comment', models.TextField(blank=True, default=None, null=True, verbose_name='комментарий')),
+                ('status', models.SmallIntegerField(choices=[(0, 'Новый'), (50, 'Обрабатывается'), (100, 'Оплаченно')], default=0, verbose_name='статус')),
+                ('city', models.ForeignKey(on_delete=django.db.models.deletion.PROTECT, to='core.City', verbose_name='Город')),
+                ('customer_user', models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.SET_NULL, to=settings.AUTH_USER_MODEL, verbose_name='пользователь')),
+            ],
+            options={
+                'verbose_name': 'Заказ',
+                'verbose_name_plural': 'Заказы',
+                'ordering': ('-create_at',),
+            },
+        ),
+        migrations.CreateModel(
+            name='SupplyTarget',
+            fields=[
+                ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
+                ('create_at', models.DateTimeField(auto_now_add=True, verbose_name='создан в')),
+                ('updated_at', models.DateTimeField(auto_now=True, verbose_name='обновлен')),
+                ('name', models.CharField(max_length=255, verbose_name='Назначение')),
+                ('slug', autoslug.fields.AutoSlugField(editable=False, populate_from='name', unique=True)),
+                ('status', models.PositiveSmallIntegerField(help_text='Необходимо указать числовой код статус', verbose_name='статус')),
+            ],
+            options={
+                'verbose_name': 'Лицензия',
+                'verbose_name_plural': 'Лицензии',
+            },
+        ),
+        migrations.CreateModel(
+            name='SupplyType',
+            fields=[
+                ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
+                ('create_at', models.DateTimeField(auto_now_add=True, verbose_name='создан в')),
+                ('updated_at', models.DateTimeField(auto_now=True, verbose_name='обновлен')),
+                ('name', models.CharField(max_length=255, verbose_name='Тип')),
+                ('slug', autoslug.fields.AutoSlugField(editable=False, populate_from='name', unique=True)),
+                ('min_term', models.IntegerField(help_text='Минимальный срок поставки', verbose_name='от')),
+                ('max_term', models.IntegerField(help_text='Максимальный срок поставки', verbose_name='до')),
+                ('term_dimension', models.SmallIntegerField(choices=[(0, 'Час'), (0, 'День'), (0, 'Неделя'), (0, 'Месяц')], default=0, verbose_name='размерность')),
+            ],
+            options={
+                'verbose_name': 'Тип поставки',
+                'verbose_name_plural': 'Тип поставки',
+            },
+        ),
+        migrations.AddField(
+            model_name='offer',
+            name='supply_target',
+            field=models.ForeignKey(blank=True, default=None, null=True, on_delete=django.db.models.deletion.SET_NULL, to='cart.SupplyTarget', verbose_name='Лицензия'),
+        ),
+        migrations.AddField(
+            model_name='offer',
+            name='supply_type',
+            field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.SET_NULL, to='cart.SupplyType', verbose_name='Поставка'),
+        ),
+        migrations.AddField(
+            model_name='buying',
+            name='offer',
+            field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='cart.Offer', verbose_name='позиция'),
+        ),
+        migrations.AddField(
+            model_name='buying',
+            name='order',
+            field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='cart.Order', verbose_name='пользователь'),
+        ),
+        migrations.AddField(
+            model_name='buying',
+            name='user',
+            field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to=settings.AUTH_USER_MODEL, verbose_name='пользователь'),
+        ),
+    ]

eshop/cart/migrations/0002_auto_20181027_1653.py

@@ -0,0 +1,25 @@
+# Generated by Django 2.0.7 on 2018-10-27 16:53
+
+import datetime
+from django.db import migrations, models
+from django.utils.timezone import utc
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('cart', '0001_initial'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='discount',
+            name='code',
+            field=models.CharField(blank=True, default='866872fd-bf5a-48bc-8e22-c3581eb7a307', max_length=50, unique=True, verbose_name='Код'),
+        ),
+        migrations.AlterField(
+            model_name='discount',
+            name='valid_to',
+            field=models.DateTimeField(blank=True, default=datetime.datetime(2018, 11, 3, 16, 53, 38, 906817, tzinfo=utc), verbose_name='Конец'),
+        ),
+    ]