From 45d5a7c6161d49f75672d3f193aa83b7f7154bc2 Mon Sep 17 00:00:00 2001
From: gzbender <gzbender74@gmail.com>
Date: Wed, 5 Dec 2018 23:08:00 +0300
Subject: [PATCH 1/2] =?UTF-8?q?LIL-711=20=D0=94=D0=BE=D0=B1=D0=B0=D0=B2?=
 =?UTF-8?q?=D0=B8=D1=82=D1=8C=20=D0=B2=20SendGrid=20=D0=BF=D0=BE=D0=BB?=
 =?UTF-8?q?=D0=B5=20course=20payment?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 apps/notification/tasks.py | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/apps/notification/tasks.py b/apps/notification/tasks.py
index 03f3cc9e..243be211 100644
--- a/apps/notification/tasks.py
+++ b/apps/notification/tasks.py
@@ -84,6 +84,8 @@ def sendgrid_update_recipients():
     for user in users:
         last_course_purchase = course_payments.get(user.id) and course_payments.get(user.id).strftime(date_format)
         last_school_purchase = school_payments.get(user.id) and school_payments.get(user.id).strftime(date_format)
+        courses_purchased = CoursePayment.objects.filter(user=user,
+                                   status__in=CoursePayment.PW_PAID_STATUSES).values_list('course_id', flat=True)
         data.append({
             'first_name': user.first_name,
             'last_name': user.last_name,
@@ -94,6 +96,7 @@ def sendgrid_update_recipients():
             # 'gender': {User.NOT_DEFINED: '', User.MALE: 'Мужчина', User.FEMALE: 'Женщина'}[user.gender] if user.gender else '',
             'birthday': user.birthday and user.birthday.strftime(date_format),
             'date_joined': user.date_joined.strftime(date_format),
+            'courses_purchased': ','.join(map(str, courses_purchased)) + ',' if courses_purchased else '',
         })
 
     sg = get_sendgrid_client()

From 7e2afd74378f1848deff61b75df6aae94442f07b Mon Sep 17 00:00:00 2001
From: gzbender <gzbender74@gmail.com>
Date: Thu, 6 Dec 2018 02:35:13 +0300
Subject: [PATCH 2/2] LIL-702

---
 web/src/components/FAQ.vue | 23 +++++++++++++++++++----
 web/src/sass/_common.sass  | 17 -----------------
 2 files changed, 19 insertions(+), 21 deletions(-)

diff --git a/web/src/components/FAQ.vue b/web/src/components/FAQ.vue
index 37d2ae59..a87ce42b 100644
--- a/web/src/components/FAQ.vue
+++ b/web/src/components/FAQ.vue
@@ -1,11 +1,10 @@
 <template>
   <div class="faq">
     <div class="faq__item" v-for="faq in faqs" :class="{'faq__item_opened': faq.opened}">
-      <div class="faq__item-head">
+      <div class="faq__item-head" @click="open(faq)">
         <div class="faq__item-question">{{ faq.question }}</div>
         <div class="faq__item-opener">
-          <svg class="icon" :class="{'icon-arrow-up': faq.opened, 'icon-arrow-down': !faq.opened}"
-               @click="open(faq)">
+          <svg class="icon" :class="{'icon-arrow-up': faq.opened, 'icon-arrow-down': !faq.opened}">
             <use xlink:href="/static/img/sprite.svg#icon-arrow-down"></use>
           </svg>
         </div>
@@ -32,4 +31,20 @@
     }
 </script>
 
-<style></style>
+<style lang="sass">
+.faq
+  &__item-head
+    display: flex
+    background: #f8f8f8
+    padding: 7px 10px 5px
+    cursor: pointer
+  &__item-question
+    flex: 1
+  &__item-opener
+    margin-left: 10px
+    & .icon
+      width: 16px
+      height: 16px
+  &__item-answer
+    padding: 10px 10px
+</style>
diff --git a/web/src/sass/_common.sass b/web/src/sass/_common.sass
index fa671cd4..03555501 100755
--- a/web/src/sass/_common.sass
+++ b/web/src/sass/_common.sass
@@ -4502,20 +4502,3 @@ a
     background: $cyan
   &__preview.theme_violet2
     background: $viol2
-
-
-.faq
-  &__item-head
-    display: flex
-    background: #f8f8f8
-    padding: 7px 10px 5px
-  &__item-question
-    flex: 1
-  &__item-opener
-    margin-left: 10px
-    cursor: pointer
-    & .icon
-      width: 16px
-      height: 16px
-  &__item-answer
-    padding: 10px 10px