better course feedback, make a photo avatar if no avatar

iliakan · iliakan · commit 3fd203bf449e · 2015-05-31T00:32:39.000+03:00
diff --git a/fixture/init/payments.js b/fixture/init/payments.js
@@ -3,10 +3,7 @@ require('payments');
 
 exports.Transaction = [];
 exports.TransactionLog = [];
-exports.Discount = [{
-  code: "DISCOUNT",
-  discount: 1
-}];
+exports.Discount = [];
 exports.Order = [];
 
 exports.OrderTemplate = [
diff --git a/handlers/courses/controller/groupFeedbackEdit.js b/handlers/courses/controller/groupFeedbackEdit.js
@@ -59,14 +59,27 @@ exports.all = function*() {
         errors[key] = e.errors[key].message;
       }
 
-      this.body = this.render('groupFeedback/feedback', {
+      this.body = this.render('feedback/edit', {
         errors: errors,
         form:   courseFeedback
       });
 
       return;
     }
 
+    // make the new picture user avatar
+    if (courseFeedback.photo && !this.user.photo) {
+      yield this.user.persist({
+        photo: courseFeedback.photo
+      });
+    }
+
+    if (courseFeedback.isPublic) {
+      this.addFlashMessage("success", "Ваш отзыв успешно сохранен. При желании, вы можете поделиться им в соц сетях.");
+    } else {
+      this.addFlashMessage("success", "Ваш отзыв успешно сохранен. Он будет виден только нам.");
+    }
+
     this.redirect(`/courses/feedback/${courseFeedback.number}`);
     return;
 
@@ -75,7 +88,7 @@ exports.all = function*() {
 
     this.locals.form = courseFeedback;
 
-    this.body = this.render('groupFeedback/feedback');
+    this.body = this.render('feedback/edit');
   }
 
 };
diff --git a/handlers/courses/controller/groupFeedbackShow.js b/handlers/courses/controller/groupFeedbackShow.js
@@ -1,6 +1,7 @@
 const mongoose = require('mongoose');
 const countries = require('countries');
 const CourseFeedback = require('../models/courseFeedback');
+const CourseGroup = require('../models/courseGroup');
 const User = require('users').User;
 const _ = require('lodash');
 
@@ -14,6 +15,8 @@ exports.get = function*() {
     this.throw(404);
   }
 
+  yield CourseGroup.populate(courseFeedback.group, 'course');
+
   var authorOrAdmin = this.user.isAdmin || String(this.user._id) == String(courseFeedback.participant.user);
   this.locals.authorOrAdmin = authorOrAdmin;
 
@@ -29,8 +32,11 @@ exports.get = function*() {
 
   this.locals.countries = countries.all;
 
+  if (authorOrAdmin) {
+    this.locals.editLink = `/courses/groups/${courseFeedback.group.slug}/feedback`;
+  }
 
-  this.body = this.render('feedback/single');
+  this.body = this.render('feedback/show');
 
 };
 
diff --git a/handlers/courses/controller/invite.js b/handlers/courses/controller/invite.js
@@ -136,7 +136,9 @@ function* askParticipantDetails(invite) {
     var participant = new CourseParticipant(participantData);
 
     try {
+
       yield participant.persist();
+
     } catch (e) {
       var errors = {};
       for (var key in e.errors) {
@@ -153,12 +155,18 @@ function* askParticipantDetails(invite) {
 
     this.log.debug(participant.toObject(), "participant is accepted");
 
+    // make the new picture user avatar
+    if (participant.photo && !this.user.photo) {
+      yield this.user.persist({
+        photo: participant.photo
+      });
+    }
+
     yield* acceptParticipant.call(this, invite, participant);
 
     // will show "welcome" cause the invite is accepted
     this.redirect('/courses/invite/' + invite.token);
 
-
   } else if (this.method == 'GET') {
 
     this.body = this.render('invite/askParticipantDetails', {
diff --git a/handlers/courses/lib/paymentMethods.js b/handlers/courses/lib/paymentMethods.js
@@ -2,7 +2,7 @@ const payments = require('payments');
 
 var paymentMethods = {};
 
-var methodsEnabled = ['webmoney', 'yandexmoney', 'payanyway', 'paypal', 'interkassa', 'banksimple', 'invoice'];
+var methodsEnabled = [ 'paypal', 'webmoney', 'yandexmoney', 'payanyway', 'interkassa', 'banksimple', 'invoice'];
 
 methodsEnabled.forEach(function(key) {
   paymentMethods[key] = payments.methods[key].info;
diff --git a/handlers/courses/router.js b/handlers/courses/router.js
@@ -20,9 +20,9 @@ router.get('/groups/:groupBySlug/materials', mustBeParticipant, require('./contr
 // because the prefix /course/download must be constant for nginx to proxy *.zip to node
 router.get('/download/:groupBySlug/:filename', mustBeParticipant, require('./controller/groupMaterialsDownload').get);
 
-router.all('/groups/:groupBySlug/feedback', mustBeParticipant, require('./controller/groupFeedback').all);
+router.all('/groups/:groupBySlug/feedback', mustBeParticipant, require('./controller/groupFeedbackEdit').all);
 
-router.get('/feedback/:feedbackNumber', require('./controller/feedback').get);
+router.get('/feedback/:feedbackNumber', require('./controller/groupFeedbackShow').get);
 
 router.patch('/participants', require('./controller/participants').patch);
 
diff --git a/handlers/courses/templates/feedback/edit.jade b/handlers/courses/templates/feedback/edit.jade
diff --git a/handlers/courses/templates/feedback/show.jade b/handlers/courses/templates/feedback/show.jade
@@ -4,16 +4,13 @@ block append variables
 
   - var layout_header_class = "main__header_center"
   - var layout_main_class = "main_width-limit"
-  - var breadcrumbs = [{ title: 'JavaScript.ru', url: 'http://javascript.ru' }, { title: 'Учебник', url: '/' }]
+  - var breadcrumbs = [{ title: 'JavaScript.ru', url: 'http://javascript.ru' }, { title: 'Учебник', url: '/' }, { title: 'Курсы', url: '/courses' }]
   - var content_class = '_center'
   - var siteToolbarCurrentSection = "courses"
+  - var sitetoolbar = true
 
 block content
 
-  //-
-    +b(class="notification notification_message notification_success")
-      +e.content Ваш отзыв успешно сохранен. При желании, вы можете поделиться им в соц сетях
-
   +b.course-feedback._result
     +e.user
       +e.userpic
@@ -39,14 +36,13 @@ block content
       for raiting in [1,2,3,4,5]
         +e('i').star ★
 
-    // TODO: не рекомендует?
     if courseFeedback.recommend
-      +e.name Рекомендует курс “Javascript, DOM, интерфейсы”
+      +e.name Рекомендует #{group.course.title.replace(/./, function(match) { return match.toLowerCase(); })}
 
     +e.body!= renderSimpledown(courseFeedback.content, {trusted: false})
 
-    if authorOrAdmin
-      +e('a').edit(href="/courses/groups/#{courseFeedback.courseGroup.slug}/feedback") редактировать
+    if editLink
+      +e('a').edit(href=editLink) редактировать
     +e.share
       +b.share-icons
         +e('span').title Поделиться
diff --git a/handlers/markup/templates/blocks/payment-settings.jade b/handlers/markup/templates/blocks/payment-settings.jade
@@ -11,7 +11,7 @@ block append variables
         +e('option').option(value="RUR") RUR
       +e('span').small-note
         | Если у вас Paypal аккаунт в рублях, вы <br>
-        | не сможете оплатить в другой валюте
+        | сможете оплатить только в RUB.
 
   if name == 'invoice'
     +e.item
@@ -36,4 +36,4 @@ block append variables
 
       +e.item_hidden
         +e('label').label(for="pay-form-bank-details") Банковские реквизиты:
-        +b('textarea').textarea-input.__textarea-bank#pay-form-bank-details(cols="30", rows="5")
+        +b('textarea').textarea-input.__textarea-bank#pay-form-bank-details(cols="30", rows="5")
diff --git a/handlers/payments/common/templates/paypal-settings.jade b/handlers/payments/common/templates/paypal-settings.jade
@@ -7,4 +7,4 @@
       +e('option').option(value="USD") USD
       +e('option').option(value="EUR") EUR
     +e('span').small-note
-      | Если у вас Российский Paypal аккаунт, вы<br> не сможете оплатить в другой валюте.
+      | Если у вас Российский Paypal аккаунт, вы<br> сможете оплатить только в RUB.
