minor

iliakan · iliakan · commit b343a6478f04 · 2015-04-29T17:09:01.000+03:00
diff --git a/handlers/courses/controller/order.js b/handlers/courses/controller/order.js
@@ -14,7 +14,7 @@ exports.patch = function*() {
 
   if ("emails" in this.request.body) {
 
-    var emails = this.request.body.emails.split(',').filter(Boolean);
+    var emails = _.unique(this.request.body.emails.split(',').filter(Boolean));
 
     this.log.debug("Incoming emails", emails);
 
diff --git a/handlers/courses/lib/createOrderFromTemplate.js b/handlers/courses/lib/createOrderFromTemplate.js
@@ -2,6 +2,7 @@ var Order = require('payments').Order;
 var OrderCreateError = require('payments').OrderCreateError;
 var CourseGroup = require('../models/courseGroup');
 var pluralize = require('textUtil/pluralize');
+var _ = require('lodash');
 
 // middleware
 // create order from template,
@@ -35,7 +36,7 @@ module.exports = function*(orderTemplate, user, requestBody) {
   if (!Array.isArray(emails)) {
     throw new OrderCreateError("Отсутствуют участники.");
   }
-  orderData.emails = emails.filter(Boolean).map(String);
+  orderData.emails = _.unique(emails.filter(Boolean).map(String));
 
   if (!user) {
     throw new OrderCreateError("Вы не авторизованы.");
diff --git a/handlers/profile/templates/partials/orders.jade b/handlers/profile/templates/partials/orders.jade
@@ -63,9 +63,10 @@ include /bem
           +e.settings-line._foot(ng-if="order.orderInfo.status != 'success'")
             +e('h4').settings-title Оплата
             +e('p').note(ng-bind-html="order.orderInfo.descriptionProfile | trust_html")
-            +e('a').cancel-order(ng-click="cancelOrder(order)") Отменить заказ
             +b('button').button._common(type="button" ng-click="changePayment(order)")
               +e('span').text Изменить метод оплаты
 
+            +e('a').cancel-order(ng-click="cancelOrder(order)") Отменить заказ
+
 
 
diff --git a/nginx/maps/migrate b/nginx/maps/migrate
@@ -1,7 +1,4 @@
 map $uri $migrate {
-  /ebook https://learn.javascript.ru/ebook;
-  /courses https://learn.javascript.ru/courses;
-
   /content/uchebnik-pdf-dlya-chteniya-i-pechati https://learn.javascript.ru/ebook;
   /node/5 https://learn.javascript.ru/intro;
   "~^/node/5/.*" https://learn.javascript.ru/intro;
