From a9ce19e2bbebc28d24e1745a96c46799f0a8d2cd Mon Sep 17 00:00:00 2001
From: gzbender <gzbender74@gmail.com>
Date: Tue, 24 Jul 2018 15:48:14 +0500
Subject: [PATCH 1/6] =?UTF-8?q?LIL-588=20=D0=9F=D1=80=D0=B8=20=D1=81=D0=BE?=
 =?UTF-8?q?=D0=B7=D0=B4=D0=B0=D0=BD=D0=B8=D0=B8=20=D0=BA=D1=83=D1=80=D1=81?=
 =?UTF-8?q?=D0=B0=20=D0=B2=D0=B8=D1=81=D0=B8=D1=82=20=D0=B1=D1=80=D0=B0?=
 =?UTF-8?q?=D1=83=D0=B7=D0=B5=D1=80=20=D0=B8=D0=B7-=D0=B7=D0=B0=20=D0=B7?=
 =?UTF-8?q?=D0=B0=D0=B3=D1=80=D1=83=D0=B7=D0=BA=D0=B8=20=D0=B1=D0=BE=D0=BB?=
 =?UTF-8?q?=D1=8C=D1=88=D0=B8=D1=85=20=D1=84=D0=BE=D1=82=D0=BE=D0=B3=D1=80?=
 =?UTF-8?q?=D0=B0=D1=84=D0=B8=D0=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 web/package.json                    |  4 ++++
 web/src/components/blocks/Image.vue | 25 ++++++++++++++-----------
 2 files changed, 18 insertions(+), 11 deletions(-)

diff --git a/web/package.json b/web/package.json
index 758fad6a..7a93432c 100755
--- a/web/package.json
+++ b/web/package.json
@@ -34,9 +34,13 @@
     "webpack": "^3.10.0"
   },
   "dependencies": {
+    "autosize": "^4.0.2",
+    "autosize-input": "^1.0.2",
     "axios": "^0.17.1",
     "babel-polyfill": "^6.26.0",
     "baguettebox.js": "^1.10.0",
+    "downscale": "^1.0.4",
+    "glob": "^7.1.2",
     "history": "^4.7.2",
     "ilyabirman-likely": "^2.3.0",
     "inputmask": "^3.3.11",
diff --git a/web/src/components/blocks/Image.vue b/web/src/components/blocks/Image.vue
index 9006500d..47841ec8 100644
--- a/web/src/components/blocks/Image.vue
+++ b/web/src/components/blocks/Image.vue
@@ -10,6 +10,7 @@
 
 <script>
     import {api} from "../../js/modules/api";
+    import downscale from 'downscale';
 
     export default {
         name: "lil-image",
@@ -25,16 +26,18 @@
                 let file = event.target.files[0];
                 let reader = new FileReader();
                 reader.onload = () => {
-                    api.uploadImage(reader.result, this.accessToken)
-                        .then((response) => {
-                            this.loading = false;
-                            this.$emit('update:imageId', response.data.id);
-                            this.$emit('update:imageUrl', response.data.image);
-                        })
-                        .catch((error) => {
-                            this.loading = false;
-                            console.log('error', error);
-                        });
+                    downscale(reader.result, 2000, 2000).then((dataURL) => {
+                        api.uploadImage(dataURL, this.accessToken)
+                            .then((response) => {
+                                this.loading = false;
+                                this.$emit('update:imageId', response.data.id);
+                                this.$emit('update:imageUrl', response.data.image);
+                            })
+                            .catch((error) => {
+                                this.loading = false;
+                                console.log('error', error);
+                            });
+                    });
                 };
                 if (file) {
                     reader.readAsDataURL(file);
@@ -51,4 +54,4 @@
     display: block;
     object-fit: contain;
   }
-</style>
\ No newline at end of file
+</style>

From f1b86d0fc7d48c3c73b52adea3aec9dbd0faa2da Mon Sep 17 00:00:00 2001
From: gzbender <gzbender74@gmail.com>
Date: Wed, 25 Jul 2018 01:47:34 +0500
Subject: [PATCH 2/6] =?UTF-8?q?LIL-588=20=D0=9F=D1=80=D0=B8=20=D1=81=D0=BE?=
 =?UTF-8?q?=D0=B7=D0=B4=D0=B0=D0=BD=D0=B8=D0=B8=20=D0=BA=D1=83=D1=80=D1=81?=
 =?UTF-8?q?=D0=B0=20=D0=B2=D0=B8=D1=81=D0=B8=D1=82=20=D0=B1=D1=80=D0=B0?=
 =?UTF-8?q?=D1=83=D0=B7=D0=B5=D1=80=20=D0=B8=D0=B7-=D0=B7=D0=B0=20=D0=B7?=
 =?UTF-8?q?=D0=B0=D0=B3=D1=80=D1=83=D0=B7=D0=BA=D0=B8=20=D0=B1=D0=BE=D0=BB?=
 =?UTF-8?q?=D1=8C=D1=88=D0=B8=D1=85=20=D1=84=D0=BE=D1=82=D0=BE=D0=B3=D1=80?=
 =?UTF-8?q?=D0=B0=D1=84=D0=B8=D0=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 web/src/components/blocks/Image.vue | 44 ++++++++++++++++++++---------
 web/src/sass/_common.sass           | 18 ++++++++++++
 2 files changed, 48 insertions(+), 14 deletions(-)

diff --git a/web/src/components/blocks/Image.vue b/web/src/components/blocks/Image.vue
index 47841ec8..11968d70 100644
--- a/web/src/components/blocks/Image.vue
+++ b/web/src/components/blocks/Image.vue
@@ -1,5 +1,5 @@
 <template>
-  <div class="kit__photo">
+  <div class="kit__photo" :class="{'loading': loading}">
     <svg class="icon icon-add-plus" v-if="!imageUrl">
       <use xlink:href="/static/img/sprite.svg#icon-add-plus"></use>
     </svg>
@@ -23,21 +23,37 @@
         methods: {
             onImageAdded(event) {
                 this.loading = true;
+                const maxSize = 1600;
                 let file = event.target.files[0];
-                let reader = new FileReader();
+                const reader = new FileReader();
                 reader.onload = () => {
-                    downscale(reader.result, 2000, 2000).then((dataURL) => {
-                        api.uploadImage(dataURL, this.accessToken)
-                            .then((response) => {
-                                this.loading = false;
-                                this.$emit('update:imageId', response.data.id);
-                                this.$emit('update:imageUrl', response.data.image);
-                            })
-                            .catch((error) => {
-                                this.loading = false;
-                                console.log('error', error);
-                            });
-                    });
+                    let img = document.createElement('img');
+                    img.onload = () => {
+                        let w = 0;
+                        let h = 0;
+                        if(img.width > img.height) {
+                            w = maxSize;
+                            h = 0;
+                        }
+                        else {
+                            w = 0;
+                            h = maxSize;
+                        }
+                        downscale(img.src, w, h).then((dataURL) => {
+                            img = null;
+                            api.uploadImage(dataURL, this.accessToken)
+                                .then((response) => {
+                                    this.loading = false;
+                                    this.$emit('update:imageId', response.data.id);
+                                    this.$emit('update:imageUrl', response.data.image);
+                                })
+                                .catch((error) => {
+                                    this.loading = false;
+                                    console.log('error', error);
+                                });
+                        });
+                    }
+                    img.src = reader.result;
                 };
                 if (file) {
                     reader.readAsDataURL(file);
diff --git a/web/src/sass/_common.sass b/web/src/sass/_common.sass
index 8386a037..f82ee0c8 100755
--- a/web/src/sass/_common.sass
+++ b/web/src/sass/_common.sass
@@ -3463,6 +3463,24 @@ a.grey-link
     .icon
       font-size: 20px
       fill: #B5B5B5
+
+    &.loading &-image
+      visibility: hidden
+    &.loading
+      .icon
+        visibility: hidden
+      &:after
+        content: ''
+        position: absolute
+        top: 50%
+        left: 50%
+        width: 24px
+        height: 24px
+        margin: -12px 0 0 -12px
+        border: 3px solid #B5B5B5
+        border-left: 3px solid transparent
+        border-radius: 50%
+        animation: loading .6s infinite linear
   &__file
     position: absolute
     top: 0

From 25a10e8473699c814ba854469a4a4d16f73f064c Mon Sep 17 00:00:00 2001
From: gzbender <gzbender74@gmail.com>
Date: Wed, 25 Jul 2018 09:49:16 +0500
Subject: [PATCH 3/6] =?UTF-8?q?LIL-588=20=D0=9F=D1=80=D0=B8=20=D1=81=D0=BE?=
 =?UTF-8?q?=D0=B7=D0=B4=D0=B0=D0=BD=D0=B8=D0=B8=20=D0=BA=D1=83=D1=80=D1=81?=
 =?UTF-8?q?=D0=B0=20=D0=B2=D0=B8=D1=81=D0=B8=D1=82=20=D0=B1=D1=80=D0=B0?=
 =?UTF-8?q?=D1=83=D0=B7=D0=B5=D1=80=20=D0=B8=D0=B7-=D0=B7=D0=B0=20=D0=B7?=
 =?UTF-8?q?=D0=B0=D0=B3=D1=80=D1=83=D0=B7=D0=BA=D0=B8=20=D0=B1=D0=BE=D0=BB?=
 =?UTF-8?q?=D1=8C=D1=88=D0=B8=D1=85=20=D1=84=D0=BE=D1=82=D0=BE=D0=B3=D1=80?=
 =?UTF-8?q?=D0=B0=D1=84=D0=B8=D0=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 apps/school/templates/school/livelesson_detail.html | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/apps/school/templates/school/livelesson_detail.html b/apps/school/templates/school/livelesson_detail.html
index 1bcb3227..7aa099a7 100644
--- a/apps/school/templates/school/livelesson_detail.html
+++ b/apps/school/templates/school/livelesson_detail.html
@@ -8,12 +8,12 @@
     <div class="lesson">
       <div class="lesson__subtitle subtitle">{{ livelesson.title }}</div>
       <div class="lesson__content">{{ livelesson.short_description }}</div>
-      <a class="lesson__video video" href="#">
+      <div class="lesson__video video">
         {% if livelesson.stream_index %}
         <iframe class="lesson__video_frame" src="https://player.vimeo.com/video/{{ livelesson.stream_index }}?autoplay=1" frameborder="0" webkitallowfullscreen
           mozallowfullscreen allowfullscreen>
         </iframe>
-        <a href="#" onclick="location.reload();">Если видео не загрузилось обновите страницу</a>
+        <span>Если видео не загрузилось - уменьшите качество видео или <a href="#" onclick="location.reload();">обновите страницу</a></span>
         <iframe class="lesson__chat_frame" src="https://vimeo.com/live-chat/{{ livelesson.stream_index }}" frameborder="0"></iframe>
         {% else %}
         {% if livelesson.cover %}
@@ -22,7 +22,7 @@
 
         {% endif %}
         {% endif %}
-      </a>
+      </div>
     </div>
   </div>
 </div>

From 74dec82c1f4c535577f143cda601d69512b0cf22 Mon Sep 17 00:00:00 2001
From: gzbender <gzbender74@gmail.com>
Date: Sun, 29 Jul 2018 06:22:59 +0500
Subject: [PATCH 4/6] =?UTF-8?q?LIL-593=20=D0=94=D0=BE=D1=80=D0=B0=D0=B1?=
 =?UTF-8?q?=D0=BE=D1=82=D0=B0=D1=82=D1=8C=20=D0=BB=D0=BE=D0=B3=D0=B8=D0=BA?=
 =?UTF-8?q?=D1=83=20=D1=80=D0=B0=D0=B1=D0=BE=D1=82=D1=8B=20=D0=BF=D0=BB?=
 =?UTF-8?q?=D0=B0=D1=82=D0=B5=D0=B6=D0=B5=D0=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 api/v1/views.py | 15 +++++++++++++--
 1 file changed, 13 insertions(+), 2 deletions(-)

diff --git a/api/v1/views.py b/api/v1/views.py
index 41cd881a..bb5eb6ed 100644
--- a/api/v1/views.py
+++ b/api/v1/views.py
@@ -419,13 +419,24 @@ class AuthorRequestViewSet(ExtendedModelViewSet):
 
 
 class PaymentViewSet(ExtendedModelViewSet):
-    queryset = Payment.objects.filter(status__isnull=False).order_by('-created_at')
+    queryset = Payment.objects.all()
     serializer_class = PaymentSerializer
     permission_classes = (IsAdmin,)
-    filter_fields = ('status',)
+    filter_fields = ('status', 'user',)
     ordering_fields = (
         'id', 'user__email',
         'user__first_name', 'user__last_name',
         'amount', 'created_at',
     )
     search_fields = ('user__email', 'user__first_name', 'user__last_name',)
+
+    def get_queryset(self):
+        queryset = self.queryset
+        course = self.request.query_params.get('course')
+        weekdays = self.request.query_params.getlist('weekdays[]')
+        if course:
+            queryset = CoursePayment.objects.filter(course=course)
+        if weekdays:
+            queryset = SchoolPayment.objects.filter(weekdays__overlap=weekdays)
+
+        return queryset.filter(status__isnull=False).order_by('-created_at')

From 1d1f516f0e25d3edb449584c4c057a70b7a5462c Mon Sep 17 00:00:00 2001
From: nikita <cfwm@yandex.ru>
Date: Fri, 10 Aug 2018 23:56:09 +0300
Subject: [PATCH 5/6] category fix

---
 apps/course/templates/course/_items.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/apps/course/templates/course/_items.html b/apps/course/templates/course/_items.html
index 42757ddc..b4356f2b 100644
--- a/apps/course/templates/course/_items.html
+++ b/apps/course/templates/course/_items.html
@@ -48,7 +48,7 @@
 </a>
 <div class="courses__details">
     <a class="courses__theme theme {{ theme_color }}"
-       href="{% url 'courses' %}?category={{ course.category.title }}">{{ course.category | upper }}</a>
+       href="{% url 'courses' %}?category={{ course.category.id }}">{{ course.category | upper }}</a>
     {% if not course.is_free %}
       <div class="courses__price">{{ course.price|floatformat:"-2" }}₽</div>
     {% endif %}

From 1258a695c8f8c3d36ec47b020d21f6d0fc0e7425 Mon Sep 17 00:00:00 2001
From: Ivlev Denis <di-erz@yandex.ru>
Date: Thu, 19 Jul 2018 15:12:14 +0300
Subject: [PATCH 6/6] LIL-575. Effective amount from payment provider

(cherry picked from commit 5393d61)
---
 apps/payment/models.py | 2 +-
 apps/payment/views.py  | 9 ++++++++-
 2 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/apps/payment/models.py b/apps/payment/models.py
index 415ad98e..25e98c82 100644
--- a/apps/payment/models.py
+++ b/apps/payment/models.py
@@ -190,7 +190,7 @@ class SchoolPayment(Payment):
             month_price_sum = aggregate.get('month_price__sum', 0) * weekday_count // all_weekday_count
         else:
             month_price_sum = aggregate.get('month_price__sum', 0)
-        if month_price_sum >= config.SERVICE_DISCOUNT_MIN_AMOUNT:
+        if self.id is None and month_price_sum >= config.SERVICE_DISCOUNT_MIN_AMOUNT:
             discount = config.SERVICE_DISCOUNT
         else:
             discount = 0
diff --git a/apps/payment/views.py b/apps/payment/views.py
index 40fccca0..afe2b8ac 100644
--- a/apps/payment/views.py
+++ b/apps/payment/views.py
@@ -197,12 +197,18 @@ class PaymentwallCallbackView(View):
             payment.status = pingback.get_type()
             payment.data = payment_raw_data
             if pingback.is_deliverable():
+                effective_amount = pingback.get_parameter('effective_price_amount')
+
+                if effective_amount:
+                    payment.amount = effective_amount
+
                 transaction_to_mixpanel.delay(
                     payment.user.id,
                     payment.amount,
                     now().strftime('%Y-%m-%dT%H:%M:%S'),
                     product_type_name,
                 )
+
                 if product_type_name == 'school':
                     school_payment = SchoolPayment.objects.filter(
                         user=payment.user,
@@ -252,6 +258,7 @@ class PaymentwallCallbackView(View):
                     'update_at': payment.update_at,
                 }
             payment.save()
+
             product_payment_to_mixpanel.delay(
                 payment.user.id,
                 f'{product_type_name.title()} payment',
@@ -269,6 +276,7 @@ class PaymentwallCallbackView(View):
                 product_type_name,
                 payment.roistat_visit,
             )
+
             author_balance = getattr(payment, 'author_balance', None)
             if author_balance and author_balance.type == AuthorBalance.IN:
                 if pingback.is_deliverable():
@@ -277,7 +285,6 @@ class PaymentwallCallbackView(View):
                     payment.author_balance.status = AuthorBalance.PENDING
                 else:
                     payment.author_balance.status = AuthorBalance.DECLINED
-
                 payment.author_balance.save()
             return HttpResponse('OK')
         else: