Merge branch 'master' of https://github.com/codecombat/codecombat

app/core/Tracker.coffee

@@ -128,7 +128,7 @@ module.exports = class Tracker
           console.error "Analytics post failed!"
       else
         request = @supermodel.addRequestResource 'log_event', {
-          url: '/db/analytics_log_event/-/log_event'
+          url: '/db/analytics.log.event/-/log_event'
           data: {event: event, properties: properties}
           method: 'POST'
         }, 0

app/locale/en.coffee

@@ -221,7 +221,10 @@
     years: "years"
 
   play_level:
+    completed_level: "Completed Level:"
+    course: "Course:"
     done: "Done"
+    next_level: "Next Level:"
     next_game: "Next game"
     show_menu: "Show game menu"
     home: "Home"  # Not used any more, will be removed soon.

app/templates/play/level/modal/hero-victory-modal.jade

@@ -12,16 +12,20 @@ block modal-body-content
     #victory-text= victoryText
 
   if isCourseLevel
+    if currentCourseName
+      p
+        span.spr.level-title(data-i18n="play_level.course")
+        span.level-name= currentCourseName
     .container-fluid
       .row
         .col-md-6
           if currentLevelName
-            .level-title Completed Level:
+            .level-title(data-i18n="play_level.completed_level")
-            .level-name= currentLevelName
+            .level-name= currentLevelName.replace('Course: ', '')
         .col-md-6
           if nextLevelName
-            .level-title Next Level:
+            .level-title(data-i18n="play_level.next_level")
-            .level-name= nextLevelName
+            .level-name= nextLevelName.replace('Course: ', '')
     br
 
   #level-feedback

app/views/play/level/modal/HeroVictoryModal.coffee

@@ -11,6 +11,7 @@ LadderSubmissionView = require 'views/play/common/LadderSubmissionView'
 AudioPlayer = require 'lib/AudioPlayer'
 User = require 'models/User'
 utils = require 'core/utils'
+Course = require 'models/Course'
 Level = require 'models/Level'
 LevelFeedback = require 'models/LevelFeedback'
 
@@ -65,6 +66,9 @@ module.exports = class HeroVictoryModal extends ModalView
     if @level.get('type', true) is 'course' and nextLevel = @level.get('nextLevel')
       @nextLevel = new Level().setURL "/db/level/#{nextLevel.original}/version/#{nextLevel.majorVersion}"
       @nextLevel = @supermodel.loadModel(@nextLevel, 'level').model
+      if @courseID
+        @course = new Course().setURL "/db/course/#{@courseID}"
+        @course = @supermodel.loadModel(@course, 'course').model
     if @level.get('type', true) in ['course', 'course-ladder']
       @saveReviewEventually = _.debounce(@saveReviewEventually, 2000)
       @loadExistingFeedback()
@@ -210,6 +214,7 @@ module.exports = class HeroVictoryModal extends ModalView
 
     c.showReturnToCourse = not c.showLeaderboard and not me.get('anonymous') and @level.get('type', true) in ['course', 'course-ladder']
     c.isCourseLevel = @level.get('type', true) in ['course']
+    c.currentCourseName = @course?.get('name')
     c.currentLevelName = @level?.get('name')
     c.nextLevelName = @nextLevel?.get('name')
 

scripts/analytics/mongodb/queries/insertPerDayAnalytics.js

@@ -101,10 +101,10 @@ try {
     }
   }
 
-  log("Getting monthly recurring revenue counts...");
+  log("Getting recurring revenue counts...");
   var recurringRevenueCounts = getRecurringRevenueCounts(startDay);
   // printjson(recurringRevenueCounts);
-  log("Inserting monthly recurring revenue counts...");
+  log("Inserting recurring revenue counts...");
   for (var event in recurringRevenueCounts) {
     for (var day in recurringRevenueCounts[event]) {
       if (today === day) continue; // Never save data for today because it's incomplete
@@ -674,9 +674,9 @@ function getRecurringRevenueCounts(startDay) {
       dailyRevenueCounts['DRR monthly subs'][day] += doc.amount
     }
     else if (doc.service === 'paypal') {
-      if (!dailyRevenueCounts['DRR paypal']) dailyRevenueCounts['DRR paypal'] = {};
+      if (!dailyRevenueCounts['DRR monthly subs']) dailyRevenueCounts['DRR monthly subs'] = {};
-      if (!dailyRevenueCounts['DRR paypal'][day]) dailyRevenueCounts['DRR paypal'][day] = 0;
+      if (!dailyRevenueCounts['DRR monthly subs'][day]) dailyRevenueCounts['DRR monthly subs'][day] = 0;
-      dailyRevenueCounts['DRR paypal'][day] += doc.amount
+      dailyRevenueCounts['DRR monthly subs'][day] += doc.amount
     }
     // else {
     //   // printjson(doc);