From e27a3130c153a9ae4e33af7e4e61eed134bb32e6 Mon Sep 17 00:00:00 2001 From: Seth Call Date: Tue, 26 Apr 2016 06:58:14 -0500 Subject: [PATCH] Fix positioning of school kudos --- ruby/lib/jam_ruby/models/lesson_booking.rb | 2 +- .../react-components/LessonPayment.js.jsx.coffee | 4 ++-- .../stylesheets/landings/individual_jamtrack.css.scss | 2 +- web/spec/features/book_test_drive_spec.rb | 6 ------ 4 files changed, 4 insertions(+), 10 deletions(-) diff --git a/ruby/lib/jam_ruby/models/lesson_booking.rb b/ruby/lib/jam_ruby/models/lesson_booking.rb index 4d7be82b9..562c5c401 100644 --- a/ruby/lib/jam_ruby/models/lesson_booking.rb +++ b/ruby/lib/jam_ruby/models/lesson_booking.rb @@ -39,7 +39,7 @@ module JamRuby belongs_to :canceler, class_name: "JamRuby::User" belongs_to :default_slot, class_name: "JamRuby::LessonBookingSlot", foreign_key: :default_slot_id, inverse_of: :defaulted_booking, :dependent => :destroy belongs_to :counter_slot, class_name: "JamRuby::LessonBookingSlot", foreign_key: :counter_slot_id, inverse_of: :countered_booking, :dependent => :destroy - has_many :lesson_booking_slots, class_name: "JamRuby::LessonBookingSlot", :dependent => :delete_all + has_many :lesson_booking_slots, class_name: "JamRuby::LessonBookingSlot", :dependent => :destroy has_many :lesson_sessions, class_name: "JamRuby::LessonSession", :dependent => :destroy has_many :lesson_package_purchases, class_name: "JamRuby::LessonPackagePurchase", :dependent => :destroy diff --git a/web/app/assets/javascripts/react-components/LessonPayment.js.jsx.coffee b/web/app/assets/javascripts/react-components/LessonPayment.js.jsx.coffee index d427e92f6..590d151c5 100644 --- a/web/app/assets/javascripts/react-components/LessonPayment.js.jsx.coffee +++ b/web/app/assets/javascripts/react-components/LessonPayment.js.jsx.coffee @@ -268,8 +268,8 @@ UserStore = context.UserStore stripeSubmitted: (response) -> logger.debug("stripe submitted: " + JSON.stringify(response)) - if @state.shouldShowName - window.UserActions.refresh() + #if @state.shouldShowName + window.UserActions.refresh() # if the response has a lesson, take them there if response.lesson?.id? diff --git a/web/app/assets/stylesheets/landings/individual_jamtrack.css.scss b/web/app/assets/stylesheets/landings/individual_jamtrack.css.scss index fc42b08e7..6bfcd8747 100644 --- a/web/app/assets/stylesheets/landings/individual_jamtrack.css.scss +++ b/web/app/assets/stylesheets/landings/individual_jamtrack.css.scss @@ -516,7 +516,7 @@ body.web.individual_jamtrack { } &.teachers { - top:618px; + top:729px; } } .jamtrack-overview-video { diff --git a/web/spec/features/book_test_drive_spec.rb b/web/spec/features/book_test_drive_spec.rb index 79ee3a544..2dd9906fb 100644 --- a/web/spec/features/book_test_drive_spec.rb +++ b/web/spec/features/book_test_drive_spec.rb @@ -23,12 +23,6 @@ describe "Test Drive", :js => true, :type => :feature, :capybara_feature => true teacher_user.teacher.save! Teacher.index(user, {})[:query].count.should eql 1 - - - end - - def finish_lesson_successfully(lesson_session) - successful_lesson(lesson_session) end describe "register via showing interesting in teacher 1st" do