Skip to content

Commit 9cc3f42

Browse files
iliakaniliakan
committed
yakassa refunds, mdeditor initial impl
1 parent b65e643 commit 9cc3f42

50 files changed

Lines changed: 698 additions & 306 deletions

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎client/clientRender.js‎

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
1-
var bem = require('bem-jade')();
2-
var thumb = require('client/image').thumb;
1+
const bem = require('bem-jade')();
2+
const thumb = require('client/image').thumb;
3+
4+
const t = require('i18n');
35

46
module.exports = function(template, locals) {
57
locals = locals ? Object.create(locals) : {};
@@ -10,7 +12,7 @@ module.exports = function(template, locals) {
1012

1113
function addStandardHelpers(locals) {
1214
locals.bem = bem;
13-
15+
locals.t = t;
1416
locals.thumb = thumb;
1517
}
1618

‎docs/fontello.zip‎

7.92 KB
Binary file not shown.

‎fixture/init/index.js‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
const _ = require('lodash');
1+
const merge = require('lodash/merge');
22

3-
module.exports = _.merge(
3+
module.exports = merge(
44
require('./user'),
55
require('./newsletter'),
66
require('./payments'),

‎gulpfile.js‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -102,6 +102,7 @@ gulp.task("payments:transaction:paid", lazyRequireTask('payments/tasks/transacti
102102
gulp.task("payments:order:cancelPending", lazyRequireTask('payments/tasks/orderCancelPending'));
103103

104104
gulp.task('payments:yakassa:listOrders', lazyRequireTask('payments/yakassa/tasks/listOrders'));
105+
gulp.task('payments:yakassa:returnPayment', lazyRequireTask('payments/yakassa/tasks/returnPayment'));
105106

106107
gulp.task("newsletter:send", lazyRequireTask('newsletter/tasks/send'));
107108
gulp.task("newsletter:createLetters", lazyRequireTask('newsletter/tasks/createLetters'));

‎handlers/auth/lib/authenticateByProfile.js‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
const User = require('users').User;
22
const config = require('config');
33
const co = require('co');
4-
const _ = require('lodash');
54
const request = require('co-request');
65
const transload = require('imgur').transload;
76
const log = require('log')();

‎handlers/cache/router.js‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@ var Router = require('koa-router');
22
var mongoose = require('mongoose');
33
var CacheEntry = require('./models/cacheEntry');
44
var mustBeAdmin = require('auth').mustBeAdmin;
5-
var _ = require('lodash');
65

76
var router = module.exports = new Router();
87

‎handlers/courses/controller/admin/invites.js‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,14 +7,15 @@ const User = require('users').User;
77
const CourseParticipant = require('../../models/courseParticipant');
88
const CourseInvite = require('../../models/courseInvite');
99
const CourseGroup = require('../../models/courseGroup');
10+
const registerParticipants = require('../../lib/registerParticipants');
1011
const assert = require('assert');
1112
const sendMail = require('mailer').send;
1213

1314
exports.post = function*() {
1415

1516
let invite = yield CourseInvite.findById(this.request.body.id).populate('participant order');
1617

17-
console.log(this.request.body.group, invite.group.toString(), '!!!!');
18+
this.log.debug("invite edit", this.request.body.group, invite.group.toString());
1819

1920
if (this.request.body.group != invite.group.toString()) {
2021
// move person to another group
@@ -33,6 +34,8 @@ exports.post = function*() {
3334
});
3435
}
3536

37+
yield* registerParticipants(invite.group);
38+
3639
this.log.debug("transfer complete for invite", invite);
3740
if (this.request.body.notify) {
3841

‎handlers/courses/controller/courseFeedback.js‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ const CourseFeedback = require('../models/courseFeedback');
66
const CourseGroup = require('../models/courseGroup');
77
const Course = require('../models/course');
88
const User = require('users').User;
9-
const _ = require('lodash');
9+
const groupBy = require('lodash/groupBy');
1010
const CacheEntry = require('cache').CacheEntry;
1111

1212
exports.get = function*() {
@@ -104,7 +104,7 @@ function* getFeedbackStats(course) {
104104
]).exec();
105105

106106

107-
recommendStats = _.groupBy(recommendStats, '_id');
107+
recommendStats = groupBy(recommendStats, '_id');
108108

109109
if (!recommendStats[true]) recommendStats[true] = [{count: 0}];
110110
if (!recommendStats[false]) recommendStats[false] = [{count: 0}];

‎handlers/courses/controller/coursesByUser.js‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@ const CourseInvite = require('../models/courseInvite');
44
const CourseParticipant = require('../models/courseParticipant');
55
const CourseGroup = require('../models/courseGroup');
66
const CourseFeedback = require('../models/courseFeedback');
7-
const _ = require('lodash');
87

98
/**
109
* The order form is sent to checkout when it's 100% valid (client-side code validated it)

‎handlers/courses/controller/groupFeedbackComment.js‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,6 @@
22

33
const countries = require('countries');
44
const CourseFeedback = require('../models/courseFeedback');
5-
const CourseParticipant = require('../models/courseParticipant');
6-
const _ = require('lodash');
75
const BasicParser = require('markit').BasicParser;
86

97
exports.patch = function*() {

0 commit comments

Comments
 (0)