diff --git a/ruby/lib/jam_ruby/models/charge.rb b/ruby/lib/jam_ruby/models/charge.rb index 83d9400ce..bac9f6890 100644 --- a/ruby/lib/jam_ruby/models/charge.rb +++ b/ruby/lib/jam_ruby/models/charge.rb @@ -59,14 +59,14 @@ module JamRuby subject = "Unable to charge user #{charged_user.email} for lesson #{self.id} (stripe)" body = "user=#{charged_user.email}\n\nbilling_error_reason=#{billing_error_reason}\n\nbilling_error_detail = #{billing_error_detail}" - AdminMailer.alerts({subject: subject, body: body}) + AdminMailer.alerts({subject: subject, body: body}).deliver do_send_unable_charge return false rescue Exception => e subject = "Unable to charge user #{charged_user.email} for lesson #{self.id} (unhandled)" body = "user=#{charged_user.email}\n\nbilling_error_reason=#{billing_error_reason}\n\nbilling_error_detail = #{billing_error_detail}" - AdminMailer.alerts({subject: subject, body: body}) + AdminMailer.alerts({subject: subject, body: body}).deliver unhandled_handler(e) return false end diff --git a/web/app/assets/stylesheets/client/lessonSessionActions.css.scss b/web/app/assets/stylesheets/client/lessonSessionActions.css.scss index c1bbc22c8..3fcda18b8 100644 --- a/web/app/assets/stylesheets/client/lessonSessionActions.css.scss +++ b/web/app/assets/stylesheets/client/lessonSessionActions.css.scss @@ -29,7 +29,7 @@ } .bt-content { - height:80px; + height:60px; width:100px; background-color:#333; overflow:auto; diff --git a/web/app/views/clients/_lessonSessionActions.html.slim b/web/app/views/clients/_lessonSessionActions.html.slim index 266fcbb8d..36dc63dc2 100644 --- a/web/app/views/clients/_lessonSessionActions.html.slim +++ b/web/app/views/clients/_lessonSessionActions.html.slim @@ -14,7 +14,7 @@ script type='text/template' id='template-lesson-session-actions' li data-lesson-option="attach-audio" a href='#' Attach Audio File - = '{% } else if (data.isActive) { %}' + = '{% } else if (data.isScheduled) { %}' ul li data-lesson-option="status" a href='#' View Status