cancel fix

ruby/lib/jam_ruby/models/music_session.rb

@@ -948,6 +948,9 @@ SQL
       if scheduled_duration.class == String
         duration = scheduled_duration.to_i.seconds
       end
+      if duration == 0
+        duration = 30 * 60
+      end
       duration
     end
 
@@ -996,7 +999,7 @@ SQL
             "#{start_time.strftime("%A, %B %e")}, #{start_time.strftime("%l:%M").strip}-#{end_time.strftime("%l:%M %p").strip} #{timezone_display}"
           end
         else
-          "#{start_time.strftime("%A, %B %e")} - #{start_time.strftime("%l:%M%P").strip}"
+          "#{start_time.strftime("%A, %B %e")} - #{end_time.strftime("%l:%M%P").strip}"
         end
 
       else

web/app/assets/javascripts/react-components/JamClassScreen.js.jsx.coffee

@@ -194,13 +194,14 @@ LessonTimerActions = context.LessonTimerActions
     @app.ajaxError(jqXHR)
 
   cancelSelected: (lesson, recurring) ->
-    rest.checkLessonCancel({id: lesson.id, update_all: recurring}).done((response) => (@issueCancelLesson(lesson,
+    rest.checkLessonCancel({id: lesson.id, update_all: recurring})
-      recurring))).fail((jqXHR) => (@cancelSelectedFail(jqXHR)))
+      .done((response) => @issueCancelLesson(lesson, recurring))
+      .fail((jqXHR) => @cancelSelectedFail(jqXHR, lesson))
 
-  cancelSelectedFailed: (jqXHR) ->
+  cancelSelectedFail: (jqXHR, lesson) ->
     if jqXHR.status == 422
 
-      if recurring
+      if lesson.recurring
         if @viewerStudent()
           buttons = []
           buttons.push({name: 'CLOSE', buttonStyle: 'button-grey'})

web/app/assets/javascripts/react-components/LessonPayment.js.jsx.coffee

@@ -502,7 +502,7 @@ UserStore = context.UserStore
             else if this.state.user.lesson_package_type_id == 'test-drive-2'
               explanation =`<span>You are purchasing the TestDrive package of JamClass by JamKazam. This purchase entitles you to take 2 private online music lessons - 1 each from 2 different instructors in the JamClass instructor community. The price of this TestDrive package is $29.99.</span>`
             else
-              alert("You do not have a test drive package selected")
+              alert("You do not have a test drive package selected:  " + this.state.user.lesson_package_type_id )
 
 
           bookingDetail = `<p>{explanation}

web/app/assets/javascripts/react-components/stores/ChatStore.js.coffee

@@ -81,7 +81,7 @@ SessionStore = context.SessionStore
         query.start = next
       return query
 
-    c: (lessonSessionId) ->
+    initializeLesson: (lessonSessionId) ->
       @lessonSessionId = lessonSessionId
       @channelType = 'lesson'
 

web/app/controllers/api_jamblasters_controller.rb

@@ -51,10 +51,10 @@ class ApiJamblastersController < ApiController
       return
     end
 
-    if jamblaster && jamblaster.users.length > 0 && !user.jamblasters.include?(jamblaster)
+#    if jamblaster && jamblaster.users.length > 0 && !user.jamblasters.include?(jamblaster)
-      render :json => {reason: "jamblaster_access", message: "current user does not have access to jamblaster #{jamblaster.id}"}, status: 403
+#      render :json => {reason: "jamblaster_access", message: "current user does not have access to jamblaster #{jamblaster.id}"}, status: 403
-      return
+#      return
-    end
+#    end
 
     render :json => {}, status: 200
   end