From fd4d21ae78cf2c214ff8aea9c05b356483bfabf2 Mon Sep 17 00:00:00 2001 From: Seth Call Date: Thu, 8 Sep 2016 05:59:58 -0500 Subject: [PATCH] school education working --- db/manifest | 3 +- db/up/second_ed.sql | 4 + ruby/lib/jam_ruby/app/mailers/user_mailer.rb | 4 + .../student_welcome_message.html.erb | 28 ++ .../teacher_welcome_message.html.erb | 21 +- ruby/lib/jam_ruby/models/charge.rb | 2 +- ruby/lib/jam_ruby/models/lesson_booking.rb | 39 +- .../models/lesson_package_purchase.rb | 42 +- .../jam_ruby/models/lesson_payment_charge.rb | 11 +- ruby/lib/jam_ruby/models/lesson_session.rb | 34 +- ruby/lib/jam_ruby/models/school.rb | 13 + ruby/lib/jam_ruby/models/teacher.rb | 16 +- .../jam_ruby/models/teacher_distribution.rb | 33 +- ruby/lib/jam_ruby/models/teacher_payment.rb | 6 +- .../jam_ruby/models/teacher_payment_charge.rb | 2 - ruby/lib/jam_ruby/models/user.rb | 22 + .../flows/monthly_recurring_lesson_spec.rb | 249 ++++++++++++ .../spec/jam_ruby/flows/normal_lesson_spec.rb | 237 ++++++++++- .../images/landing/Scott Himel - Avatar.png | Bin 0 -> 16637 bytes .../landing/Scott Himel - Speech Bubble.png | Bin 0 -> 43291 bytes .../AccountSchoolScreen.js.jsx.coffee | 146 +++++-- .../react-components/BookLesson.js.jsx.coffee | 2 +- .../InviteSchoolUserDialog.js.jsx.coffee | 88 +++- .../TeacherProfile.js.jsx.coffee | 4 +- ...ssEducationLandingBottomPage.js.jsx.coffee | 378 ++++++++++++++++++ ...JamClassEducationLandingPage.js.jsx.coffee | 175 ++++++++ .../JamClassSchoolLandingPage.js.jsx.coffee | 77 ++-- .../RetailerTeacherLandingPage.js.jsx.coffee | 2 +- .../SchoolStudentLandingPage.js.jsx.coffee | 14 +- .../SchoolTeacherLandingPage.js.jsx.coffee | 2 +- .../SchoolTeacherListPage.js.jsx.coffee | 233 +++++++++++ .../mixins/PostProcessorMixin.js.coffee | 5 +- .../stores/ChatStore.js.coffee | 2 +- .../assets/stylesheets/client/jamkazam.scss | 15 + .../stylesheets/dialogs/inviteSchoolUser.scss | 6 + .../landings/individual_jamtrack.scss | 28 +- .../stylesheets/landings/school_landing.scss | 370 ++++++++++++++++- .../api_teacher_distributions_controller.rb | 1 - web/app/controllers/landings_controller.rb | 31 +- web/app/views/api_lesson_sessions/show.rabl | 2 +- web/app/views/api_schools/show.rabl | 10 +- .../views/api_teacher_distributions/show.rabl | 4 + web/app/views/api_teachers/detail.rabl | 3 + web/app/views/api_users/show.rabl | 4 + .../views/api_users/show_teacher_index.rabl | 5 + .../landings/jam_class_education.html.slim | 14 + .../landings/school_teacher_list.html.slim | 5 + web/config/routes.rb | 6 +- web/config/sitemap.rb | 3 + 49 files changed, 2223 insertions(+), 178 deletions(-) create mode 100644 db/up/second_ed.sql create mode 100644 web/app/assets/images/landing/Scott Himel - Avatar.png create mode 100644 web/app/assets/images/landing/Scott Himel - Speech Bubble.png create mode 100644 web/app/assets/javascripts/react-components/landing/JamClassEducationLandingBottomPage.js.jsx.coffee create mode 100644 web/app/assets/javascripts/react-components/landing/JamClassEducationLandingPage.js.jsx.coffee create mode 100644 web/app/assets/javascripts/react-components/landing/SchoolTeacherListPage.js.jsx.coffee create mode 100644 web/app/views/landings/jam_class_education.html.slim create mode 100644 web/app/views/landings/school_teacher_list.html.slim diff --git a/db/manifest b/db/manifest index 3719337d9..e229d8d59 100755 --- a/db/manifest +++ b/db/manifest @@ -364,4 +364,5 @@ immediate_recordings.sql nullable_user_id_jamblaster.sql rails4_migration.sql non_free_jamtracks.sql -retailers.sql \ No newline at end of file +retailers.sql +second_ed.sql \ No newline at end of file diff --git a/db/up/second_ed.sql b/db/up/second_ed.sql new file mode 100644 index 000000000..f89ce3014 --- /dev/null +++ b/db/up/second_ed.sql @@ -0,0 +1,4 @@ +ALTER TABLE schools ADD COLUMN education BOOLEAN NOT NULL DEFAULT FALSE; +ALTER TABLE teacher_distributions ADD COLUMN education BOOLEAN NOT NULL DEFAULT FALSE; +ALTER TABLE lesson_bookings ADD COLUMN same_school_free BOOLEAN NOT NULL DEFAULT FALSE; +UPDATE lesson_bookings SET same_school_free = true where same_school = true; \ No newline at end of file diff --git a/ruby/lib/jam_ruby/app/mailers/user_mailer.rb b/ruby/lib/jam_ruby/app/mailers/user_mailer.rb index 14b491c2b..dc4c31eac 100644 --- a/ruby/lib/jam_ruby/app/mailers/user_mailer.rb +++ b/ruby/lib/jam_ruby/app/mailers/user_mailer.rb @@ -52,6 +52,7 @@ module JamRuby def student_welcome_message(user) @user = user @subject = "Welcome to JamKazam and JamClass online lessons!" + @education = user.school && user.school.education sendgrid_category "Welcome" sendgrid_unique_args :type => "welcome_message" @@ -68,6 +69,9 @@ module JamRuby def teacher_welcome_message(user) @user = user @subject= "Welcome to JamKazam and JamClass online lessons!" + + @education = user.teacher && user.teacher.school && user.teacher.school.education + sendgrid_category "Welcome" sendgrid_unique_args :type => "welcome_message" diff --git a/ruby/lib/jam_ruby/app/views/jam_ruby/user_mailer/student_welcome_message.html.erb b/ruby/lib/jam_ruby/app/views/jam_ruby/user_mailer/student_welcome_message.html.erb index d2d9a47f2..10426f858 100644 --- a/ruby/lib/jam_ruby/app/views/jam_ruby/user_mailer/student_welcome_message.html.erb +++ b/ruby/lib/jam_ruby/app/views/jam_ruby/user_mailer/student_welcome_message.html.erb @@ -6,6 +6,33 @@

<% end %> +<% if @education %> +

+ Thank you for signing up to take online music lessons using the JamClass service by JamKazam. JamKazam technology was built from the ground up for playing music live in sync with studio quality audio from different locations over the Internet, and for delivering amazing online music lessons. +

+

+ To get ready to take JamClass lessons online, here are the things you'll want to do: +

+ +

1. Set Up Your Gear
+ When you sign up, someone from JamKazam will get in touch with you via email within a couple of business days to help you get set up. If you don't hear from us within a couple of days, please email us at support@jamkazam.com or call us at 1-877-376-8742. To play in online lessons, you will need at a minimum: (1) a Windows or Mac computer; (2) normal home Internet service; and (3) a pair of headphones or earbuds you can plug into the headphone minijack on your computer. If you would like to benefit from studio quality audio (recommended) in your lessons, JamKazam offers an amazing audio package for just $49.99 (less than our cost) that includes an audio interface (a little box that connects to your computer via USB cable), a microphone, a mic cable, and a mic stand. We'll discuss these options with you, and we're happy to support you whichever path you choose. We'll help step you through the setup process, and we'll even get into an online session with you to make sure everything is working properly, and to show you some of the key features you can use during online lessons. + +

+ +

2. Book Lessons
+ Once your gear is set up, you are ready to take lessons. Go to this web page: <%= @user.school.teacher_list_url %>. If your school has preferred instructors, they will be listed on this page, and you can click a button to book a lesson with the teacher from whom you want to take lessons. If your school doesn't have preferred instructors, then there is a link on this page to use our teacher search feature to find a great instructor from our broader community of teachers. You'll need your parents to enter credit card information to pay for your lessons. We use one of the largest and most secure commerce platforms on the Internet called Stripe, so you can feel confident your financial information will be very secure. +

+ +

3. Learn About JamClass Features
+ You can also review our JamClass user guide for students + to familiarize yourself with the features and resources available to you through our JamClass lesson service. This includes how to join your teacher in online lessons, features you can use while in lessons, and more. +

+ +

+ Again, welcome to JamKazam and our JamClass online music lesson service, and we look forward to helping you learn and grow as a musician! +

+<% else %> +

Thank you for signing up to take online music lessons using the JamClass service by JamKazam. JamKazam technology was @@ -47,6 +74,7 @@ Again, welcome to JamKazam and our JamClass online music lesson service, and we look forward to helping you learn and grow as a musician!

+<% end %>

Best Regards,
Team JamKazam

\ No newline at end of file diff --git a/ruby/lib/jam_ruby/app/views/jam_ruby/user_mailer/teacher_welcome_message.html.erb b/ruby/lib/jam_ruby/app/views/jam_ruby/user_mailer/teacher_welcome_message.html.erb index 0590bfa1c..98e626d51 100644 --- a/ruby/lib/jam_ruby/app/views/jam_ruby/user_mailer/teacher_welcome_message.html.erb +++ b/ruby/lib/jam_ruby/app/views/jam_ruby/user_mailer/teacher_welcome_message.html.erb @@ -30,14 +30,19 @@

2. Set Up Your Gear
- Click - here for information on the gear requirements to effectively teach using the JamClass service. When you have - everything you need, - use - this set of help articles as a good step-by-step guide to set up your gear for use with the - JamKazam application. After you have signed up, someone from JamKazam will contact you to schedule a test online - session, in which we will make sure your audio and video gear are working properly in an online session, and to make - sure you feel comfortable with the key features you will be using in sessions with students. + <% if @education %> + Click + here for information on the gear requirements to effectively teach using the JamClass service. At a minimum, you'll need a Windows or Mac computer and home Internet service, but we also recommend using an audio interface for superior audio quality. If you already have an audio interface for home recording, you can very likely use the one you have. If not, JamKazam offers a high quality audio package of an audio interface (a small box you connect to your computer via USB cable), a microphone, a mic cable, and a mic stand for just $49.99 (less than our cost). After you have signed up, someone from JamKazam will contact you to schedule a 1:1 help session to help you get set up, to make sure your audio and video gear are working properly in an online session, and to make sure you feel comfortable with the key features you will be using in sessions with students. + <% else %> + Click + here for information on the gear requirements to effectively teach using the JamClass service. When you have + everything you need, + use + this set of help articles as a good step-by-step guide to set up your gear for use with the + JamKazam application. After you have signed up, someone from JamKazam will contact you to schedule a test online + session, in which we will make sure your audio and video gear are working properly in an online session, and to make + sure you feel comfortable with the key features you will be using in sessions with students. + <% end %>

3. Learn About JamClass Features
diff --git a/ruby/lib/jam_ruby/models/charge.rb b/ruby/lib/jam_ruby/models/charge.rb index 8ae916979..7854d712c 100644 --- a/ruby/lib/jam_ruby/models/charge.rb +++ b/ruby/lib/jam_ruby/models/charge.rb @@ -81,7 +81,7 @@ module JamRuby 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}).deliver + AdminMailer.alerts({subject: subject, body: body}).deliver_now return false end diff --git a/ruby/lib/jam_ruby/models/lesson_booking.rb b/ruby/lib/jam_ruby/models/lesson_booking.rb index 505257dc3..a4f1efb8d 100644 --- a/ruby/lib/jam_ruby/models/lesson_booking.rb +++ b/ruby/lib/jam_ruby/models/lesson_booking.rb @@ -95,7 +95,7 @@ module JamRuby end def after_create - if (card_presumed_ok || school_on_school?) && !sent_notices + if (card_presumed_ok || !payment_if_school_on_school?) && !sent_notices send_notices end end @@ -393,8 +393,8 @@ module JamRuby end def requires_teacher_distribution?(target) - if school_on_school? - false + if no_school_on_school_payment? + return false elsif target.is_a?(JamRuby::LessonSession) is_test_drive? || (is_normal? && !is_monthly_payment?) elsif target.is_a?(JamRuby::LessonPackagePurchase) @@ -520,7 +520,17 @@ module JamRuby end end - def distribution_price_in_cents(target) + def distribution_price_in_cents(target, education) + distribution = teacher_distribution_price_in_cents(target) + + if education + (distribution * 0.0625).round + else + distribution + end + end + + def teacher_distribution_price_in_cents(target) if is_single_free? 0 elsif is_test_drive? @@ -759,8 +769,10 @@ module JamRuby if user lesson_booking.same_school = !!(lesson_booking.school && user.school && (lesson_booking.school.id == user.school.id)) + lesson_booking.same_school_free = lesson_booking.school_on_school_payment? else lesson_booking.same_school = false + lesson_booking.same_school_free = false end # two-way association slots, for before_validation loic in slot to work @@ -779,7 +791,7 @@ module JamRuby end def self.unprocessed(current_user) - LessonBooking.where(user_id: current_user.id).where(card_presumed_ok: false).where('school_id IS NULL') + LessonBooking.where(user_id: current_user.id).where(card_presumed_ok: false).where(same_school_free: false) end def self.requested(current_user) @@ -790,6 +802,19 @@ module JamRuby same_school end + def school_on_school_payment? + !!(same_school && school.education) + end + + def no_school_on_school_payment? + !!(school_on_school? && !school_on_school_payment?) + end + + # if this is school-on-school, is payment required? + def payment_if_school_on_school? + !!(!school_on_school? || school_on_school_payment?) + end + def school_and_teacher if school && school.scheduling_comm? [school.communication_email, teacher.email] @@ -862,7 +887,7 @@ module JamRuby .joins("LEFT JOIN lesson_package_purchases ON (lesson_package_purchases.lesson_booking_id = lesson_bookings.id AND (lesson_package_purchases.year = #{current_month_first_day.year} AND lesson_package_purchases.month = #{current_month_first_day.month}))") .where("lesson_package_purchases.id IS NULL OR (lesson_package_purchases.id IS NOT NULL AND lesson_package_purchases.post_processed = false)") .where(payment_style: PAYMENT_STYLE_MONTHLY) - .where(same_school: false) + .where(same_school_free: false) .active .where('music_sessions.scheduled_start >= ?', current_month_first_day) .where('music_sessions.scheduled_start <= ?', current_month_last_day).uniq @@ -932,8 +957,10 @@ module JamRuby def bill_for_month(day_in_month) # try to find lesson package purchase for this month, and last month, and see if they need processing + puts "bill_for_month" current_month_purchase = lesson_package_purchases.where(lesson_booking_id: self.id, user_id: student.id, year: day_in_month.year, month: day_in_month.month).first if current_month_purchase.nil? + puts "bill_for_month - day" current_month_purchase = LessonPackagePurchase.create(user, self, lesson_package_type, day_in_month.year, day_in_month.month) end current_month_purchase.bill_monthly diff --git a/ruby/lib/jam_ruby/models/lesson_package_purchase.rb b/ruby/lib/jam_ruby/models/lesson_package_purchase.rb index 2f88af5c5..076d14338 100644 --- a/ruby/lib/jam_ruby/models/lesson_package_purchase.rb +++ b/ruby/lib/jam_ruby/models/lesson_package_purchase.rb @@ -4,7 +4,9 @@ module JamRuby @@log = Logging.logger[LessonPackagePurchase] - delegate :sent_billing_notices, :last_billing_attempt_at, :billing_attempts, :billing_should_retry, :billed, :billed_at, :billing_error_detail, :billing_error_reason, :is_card_declined?, :is_card_expired?, :last_billed_at_date, :sent_billing_notices, to: :lesson_payment_charge + delegate :sent_billing_notices, :last_billing_attempt_at, :billing_attempts, :billing_should_retry, :billed, :billed_at, + :billing_error_detail, :billing_error_reason, :is_card_declined?, :is_card_expired?, + :last_billed_at_date, :sent_billing_notices, to: :lesson_payment_charge delegate :test_drive_count, to: :lesson_package_type # who purchased the lesson package? @@ -14,7 +16,7 @@ module JamRuby belongs_to :lesson_booking, class_name: "JamRuby::LessonBooking" belongs_to :lesson_payment_charge, class_name: "JamRuby::LessonPaymentCharge", foreign_key: :charge_id has_one :lesson_session, class_name: "JamRuby::LessonSession", dependent: :destroy - has_one :teacher_distribution, class_name: "JamRuby::TeacherDistribution" + has_many :teacher_distributions, class_name: "JamRuby::TeacherDistribution" has_one :sale_line_item, class_name: "JamRuby::SaleLineItem", dependent: :destroy @@ -35,7 +37,7 @@ module JamRuby end def create_charge - if !school_on_school? && lesson_booking && lesson_booking.is_monthly_payment? + if payment_if_school_on_school? && lesson_booking && lesson_booking.is_monthly_payment? self.lesson_payment_charge = LessonPaymentCharge.new lesson_payment_charge.user = user lesson_payment_charge.amount_in_cents = 0 @@ -45,16 +47,22 @@ module JamRuby end end + def teacher_distribution + teacher_distributions.where(education:false).first + end + + def education_distribution + teacher_distributions.where(education:true).first + end + def add_test_drives if self.lesson_package_type.is_test_drive? new_test_drives = user.remaining_test_drives + lesson_package_type.test_drive_count User.where(id: user.id).update_all(remaining_test_drives: new_test_drives) user.remaining_test_drives = new_test_drives end - end - def to_s "#{name}" end @@ -79,9 +87,14 @@ module JamRuby purchase.recurring = true if lesson_booking && lesson_booking.requires_teacher_distribution?(purchase) - purchase.teacher_distribution = TeacherDistribution.create_for_lesson_package_purchase(purchase) + teacher_dist = TeacherDistribution.create_for_lesson_package_purchase(purchase, false) + purchase.teacher_distributions << teacher_dist # price should always match the teacher_distribution, if there is one - purchase.price = purchase.teacher_distribution.amount_in_cents / 100 + purchase.price = teacher_dist.amount_in_cents / 100 + + if lesson_booking.school_on_school_payment? + self.teacher_distributions << TeacherDistribution.create_for_lesson_package_purchase(purchase, true) + end end else purchase.recurring = false @@ -136,10 +149,23 @@ module JamRuby end end + def school_on_school_payment? + !!(school_on_school? && teacher.teacher.school.education) + end + + def no_school_on_school_payment? + !!(school_on_school? && !school_on_school_payment?) + end + + # if this is school-on-school, is payment required? + def payment_if_school_on_school? + !!(!school_on_school? || school_on_school_payment?) + end def bill_monthly(force = false) - if school_on_school? + if school_on_school_payment? + puts "SCHOOL ON SCHOOL PAYMENT OH NO" raise "school-on-school: should not be here" else lesson_payment_charge.charge(force) diff --git a/ruby/lib/jam_ruby/models/lesson_payment_charge.rb b/ruby/lib/jam_ruby/models/lesson_payment_charge.rb index c4f5dd508..b4bb267a3 100644 --- a/ruby/lib/jam_ruby/models/lesson_payment_charge.rb +++ b/ruby/lib/jam_ruby/models/lesson_payment_charge.rb @@ -63,11 +63,8 @@ module JamRuby post_sale_test_failure - distribution = target.teacher_distribution - if distribution # not all lessons/payment charges have a distribution - distribution.ready = true - distribution.save(validate: false) - end + target.teacher_distributions.update_all(ready:true) # possibly there are 0 distributions on this lesson + stripe_charge end @@ -103,7 +100,9 @@ module JamRuby end def expected_price_in_cents - target.lesson_booking.distribution_price_in_cents(target) + distribution = target.teacher_distribution + for_education = distribution && distribution.education + target.lesson_booking.distribution_price_in_cents(target, for_education) end end end \ No newline at end of file diff --git a/ruby/lib/jam_ruby/models/lesson_session.rb b/ruby/lib/jam_ruby/models/lesson_session.rb index c9de915a8..88a42a2e9 100644 --- a/ruby/lib/jam_ruby/models/lesson_session.rb +++ b/ruby/lib/jam_ruby/models/lesson_session.rb @@ -11,7 +11,7 @@ module JamRuby @@log = Logging.logger[LessonSession] delegate :sent_billing_notices, :last_billing_attempt_at, :billing_attempts, :billing_should_retry, :billed_at, :billing_error_detail, :billing_error_reason, :is_card_declined?, :is_card_expired?, :last_billed_at_date, :sent_billing_notices, to: :lesson_payment_charge, allow_nil: true - delegate :is_test_drive?, :is_single_free?, :is_normal?, :approved_before?, :is_active?, :recurring, :is_monthly_payment?, :school_on_school?, :scheduling_email, :teacher_school_emails, :school_and_teacher, :school_over_teacher, :school_and_teacher_ids, :school_over_teacher_ids, to: :lesson_booking + delegate :is_test_drive?, :is_single_free?, :is_normal?, :approved_before?, :is_active?, :recurring, :is_monthly_payment?, :school_on_school?, :school_on_school_payment?, :no_school_on_school_payment?, :payment_if_school_on_school?, :scheduling_email, :teacher_school_emails, :school_and_teacher, :school_over_teacher, :school_and_teacher_ids, :school_over_teacher_ids, to: :lesson_booking delegate :pretty_scheduled_start, to: :music_session @@ -41,7 +41,7 @@ module JamRuby belongs_to :slot, class_name: "JamRuby::LessonBookingSlot", foreign_key: :slot_id, :dependent => :destroy belongs_to :lesson_payment_charge, class_name: "JamRuby::LessonPaymentCharge", foreign_key: :charge_id belongs_to :counter_slot, class_name: "JamRuby::LessonBookingSlot", foreign_key: :counter_slot_id, inverse_of: :countered_lesson, :dependent => :destroy - has_one :teacher_distribution, class_name: "JamRuby::TeacherDistribution", dependent: :destroy + has_many :teacher_distributions, class_name: "JamRuby::TeacherDistribution", dependent: :destroy has_many :lesson_booking_slots, class_name: "JamRuby::LessonBookingSlot" has_many :notifications, :class_name => "JamRuby::Notification", :foreign_key => "lesson_session_id" has_many :chat_messages, :class_name => "JamRuby::ChatMessage", :foreign_key => "lesson_session_id" @@ -86,7 +86,7 @@ module JamRuby .order('music_sessions.scheduled_start DESC') } def create_charge - if !school_on_school? && !is_test_drive? && !is_monthly_payment? + if payment_if_school_on_school? && !is_test_drive? && !is_monthly_payment? self.lesson_payment_charge = LessonPaymentCharge.new lesson_payment_charge.user = @assigned_student lesson_payment_charge.amount_in_cents = 0 @@ -96,6 +96,14 @@ module JamRuby end end + def teacher_distribution + teacher_distributions.where(education:false).first + end + + def education_distribution + teacher_distributions.where(education:true).first + end + def manage_slot_changes # if this slot changed, we need to update the time. But LessonBooking does this for us, for requested/accepted . # TODO: what to do, what to do. @@ -209,7 +217,10 @@ module JamRuby self.status = STATUS_COMPLETED if success && lesson_booking.requires_teacher_distribution?(self) - self.teacher_distribution = TeacherDistribution.create_for_lesson(self) + self.teacher_distributions << TeacherDistribution.create_for_lesson(self, false) + if lesson_booking.school_on_school_payment? + self.teacher_distributions << TeacherDistribution.create_for_lesson(self, true) + end end if self.save @@ -292,7 +303,7 @@ module JamRuby end def bill_lesson - if school_on_school? + if no_school_on_school_payment? success = true else lesson_payment_charge.charge @@ -341,14 +352,9 @@ module JamRuby def test_drive_completed - distribution = teacher_distribution - if !sent_notices if success - if distribution # not all lessons/payment charges have a distribution - distribution.ready = true - distribution.save(validate: false) - end + teacher_distributions.update_all(ready:true) # possibly there are 0 distributions on this lesson student.test_drive_succeeded(self) else student.test_drive_failed(self) @@ -387,7 +393,7 @@ module JamRuby else if lesson_booking.is_monthly_payment? if !sent_notices - if !school_on_school? + if payment_if_school_on_school? # bad session; just poke user UserMailer.monthly_recurring_no_bill(self).deliver_now end @@ -401,7 +407,7 @@ module JamRuby else if !sent_notices - if !school_on_school? + if payment_if_school_on_school? # bad session; just poke user UserMailer.student_lesson_normal_no_bill(self).deliver_now end @@ -422,7 +428,7 @@ module JamRuby bill_lesson else if !sent_notices - if !school_on_school? + if payment_if_school_on_school? UserMailer.student_lesson_normal_no_bill(self).deliver_now UserMailer.teacher_lesson_normal_no_bill(self).deliver_now end diff --git a/ruby/lib/jam_ruby/models/school.rb b/ruby/lib/jam_ruby/models/school.rb index 1e7523b50..94aaea30e 100644 --- a/ruby/lib/jam_ruby/models/school.rb +++ b/ruby/lib/jam_ruby/models/school.rb @@ -24,6 +24,7 @@ module JamRuby validates :user, presence: true validates :enabled, inclusion: {in: [true, false]} + validates :education, inclusion: {in: [true, false]} validates :scheduling_communication, inclusion: {in: SCHEDULING_COMMS} validates :correspondence_email, email: true, allow_blank: true validate :validate_avatar_info @@ -31,6 +32,10 @@ module JamRuby after_create :create_affiliate before_save :stringify_avatar_info, :if => :updating_avatar + def is_education? + education + end + def scheduling_comm? scheduling_communication == SCHEDULING_COMM_SCHOOL end @@ -39,6 +44,10 @@ module JamRuby correspondence_email.blank? ? owner.email : correspondence_email end + def approved_teachers + teachers.where('teachers.ready_for_session_at is not null') + end + def create_affiliate AffiliatePartner.create_from_school(self) end @@ -119,4 +128,8 @@ module JamRuby self.crop_selection = crop_selection.to_json if !crop_selection.nil? end end + + def teacher_list_url + "#{APP_CONFIG.external_root_url}/school/#{id}/teachers" + end end diff --git a/ruby/lib/jam_ruby/models/teacher.rb b/ruby/lib/jam_ruby/models/teacher.rb index 14d1fe2f5..126847f48 100644 --- a/ruby/lib/jam_ruby/models/teacher.rb +++ b/ruby/lib/jam_ruby/models/teacher.rb @@ -416,21 +416,7 @@ module JamRuby ## !!!! this is only valid for tests def stripe_account_id=(new_acct_id) - existing = user.stripe_auth - existing.destroy if existing - - user_auth_hash = { - :provider => 'stripe_connect', - :uid => new_acct_id, - :token => 'bogus', - :refresh_token => 'refresh_bogus', - :token_expiration => Date.new(2050, 1, 1), - :secret => "secret" - } - - authorization = user.user_authorizations.build(user_auth_hash) - authorization.save! - + user.stripe_account_id = new_acct_id end # how complete is their profile? diff --git a/ruby/lib/jam_ruby/models/teacher_distribution.rb b/ruby/lib/jam_ruby/models/teacher_distribution.rb index 5d93d3581..51c964329 100644 --- a/ruby/lib/jam_ruby/models/teacher_distribution.rb +++ b/ruby/lib/jam_ruby/models/teacher_distribution.rb @@ -43,24 +43,26 @@ module JamRuby end end - def self.create_for_lesson(lesson_session) - distribution = create(lesson_session) + def self.create_for_lesson(lesson_session, for_education) + distribution = create(lesson_session, for_education) distribution.lesson_session = lesson_session + distribution.education = for_education distribution end - def self.create_for_lesson_package_purchase(lesson_package_purchase) - distribution = create(lesson_package_purchase) + def self.create_for_lesson_package_purchase(lesson_package_purchase, for_education) + distribution = create(lesson_package_purchase, for_education) distribution.lesson_package_purchase = lesson_package_purchase + distribution.education = for_education distribution end - def self.create(target) + def self.create(target, education) distribution = TeacherDistribution.new distribution.teacher = target.teacher distribution.ready = false distribution.distributed = false - distribution.amount_in_cents = target.lesson_booking.distribution_price_in_cents(target) + distribution.amount_in_cents = target.lesson_booking.distribution_price_in_cents(target, education) distribution.school = target.lesson_booking.school distribution end @@ -82,6 +84,7 @@ module JamRuby end def real_distribution + (real_distribution_in_cents / 100.0) end @@ -109,17 +112,21 @@ module JamRuby end def calculate_teacher_fee - if is_test_drive? + if education 0 else - if school - # if school exists, use it's rate - rate = school.jamkazam_rate + if is_test_drive? + 0 else - # otherwise use the teacher's rate - rate = teacher.teacher.jamkazam_rate + if school + # if school exists, use it's rate + rate = school.jamkazam_rate + else + # otherwise use the teacher's rate + rate = teacher.teacher.jamkazam_rate + end + (amount_in_cents * (rate + 0.03)).round end - (amount_in_cents * (rate + 0.03)).round end end diff --git a/ruby/lib/jam_ruby/models/teacher_payment.rb b/ruby/lib/jam_ruby/models/teacher_payment.rb index 25ac5f614..44bb299c7 100644 --- a/ruby/lib/jam_ruby/models/teacher_payment.rb +++ b/ruby/lib/jam_ruby/models/teacher_payment.rb @@ -15,7 +15,11 @@ module JamRuby # pay the school if the payment owns the school; otherwise default to the teacher def payable_teacher if school - school.owner + if school.education + teacher + else + school.owner + end else teacher end diff --git a/ruby/lib/jam_ruby/models/teacher_payment_charge.rb b/ruby/lib/jam_ruby/models/teacher_payment_charge.rb index 3d74167b7..ce52fd143 100644 --- a/ruby/lib/jam_ruby/models/teacher_payment_charge.rb +++ b/ruby/lib/jam_ruby/models/teacher_payment_charge.rb @@ -21,8 +21,6 @@ module JamRuby def do_charge(force) - # source will let you supply a token. But... how to get a token in this case? - @stripe_charge = Stripe::Charge.create( :amount => amount_in_cents, :currency => "usd", diff --git a/ruby/lib/jam_ruby/models/user.rb b/ruby/lib/jam_ruby/models/user.rb index 4faf1d925..7b098b08c 100644 --- a/ruby/lib/jam_ruby/models/user.rb +++ b/ruby/lib/jam_ruby/models/user.rb @@ -2033,6 +2033,24 @@ module JamRuby customer end + ## !!!! this is only valid for tests + def stripe_account_id=(new_acct_id) + existing = stripe_auth + existing.destroy if existing + + user_auth_hash = { + :provider => 'stripe_connect', + :uid => new_acct_id, + :token => 'bogus', + :refresh_token => 'refresh_bogus', + :token_expiration => Date.new(2050, 1, 1), + :secret => "secret" + } + + authorization = user_authorizations.build(user_auth_hash) + authorization.save! + end + def card_approved(token, zip, booking_id, test_drive_package_choice_id = nil) approved_booking = nil @@ -2261,6 +2279,10 @@ module JamRuby LessonBooking.engaged_bookings(student, self, since_at).test_drive.count > 0 end + def same_school_with_student?(student) + student.school && self.teacher && self.teacher.school && student.school.id == self.teacher.school.id + end + private def create_remember_token self.remember_token = SecureRandom.urlsafe_base64 diff --git a/ruby/spec/jam_ruby/flows/monthly_recurring_lesson_spec.rb b/ruby/spec/jam_ruby/flows/monthly_recurring_lesson_spec.rb index 1f8ca34a1..fee6bf527 100644 --- a/ruby/spec/jam_ruby/flows/monthly_recurring_lesson_spec.rb +++ b/ruby/spec/jam_ruby/flows/monthly_recurring_lesson_spec.rb @@ -35,6 +35,8 @@ describe "Monthly Recurring Lesson Flow" do booking.card_presumed_ok.should be_false booking.user.should eql user booking.card_presumed_ok.should be_false + booking.same_school.should be_false + booking.same_school_free.should be_false booking.should eql user.unprocessed_normal_lesson booking.sent_notices.should be_false booking.booked_price.should eql 30.00 @@ -213,6 +215,252 @@ describe "Monthly Recurring Lesson Flow" do + # teacher & student get into session + start = lesson_session.scheduled_start + end_time = lesson_session.scheduled_start + (60 * lesson_session.duration) + uh2 = FactoryGirl.create(:music_session_user_history, user: teacher_user, history: lesson_session.music_session, created_at: start, session_removed_at: end_time) + # artificially end the session, which is covered by other background jobs + lesson_session.music_session.session_removed_at = end_time + lesson_session.music_session.save! + + + UserMailer.deliveries.clear + # background code comes around and analyses the session + LessonSession.hourly_check + lesson_session.reload + lesson_session.analysed.should be_true + analysis = lesson_session.analysis + analysis["reason"].should eql LessonSessionAnalyser::STUDENT_FAULT + analysis["student"].should eql LessonSessionAnalyser::NO_SHOW + if lesson_session.billing_error_detail + puts "monthly recurring lesson flow #{lesson_session.billing_error_detail}" # this should not occur, but helps a great deal if a regression occurs and running all the tests + end + + lesson.amount_charged.should eql 0.0 + lesson_session.billing_error_reason.should be_nil + lesson_session.sent_billing_notices.should be nil + user.reload + user.remaining_test_drives.should eql 0 + UserMailer.deliveries.length.should eql 0 # one for student + end + + it "works (school on school education)" do + + # make sure teacher can get payments + teacher.stripe_account_id = stripe_account1_id + school.user.stripe_account_id = stripe_account2_id + + # get user and teacher into same school + school.education = true + school.save! + user.school = school + user.save! + teacher.school = school + teacher.save! + + + # if it's later in the month, we'll make 2 lesson_package_purchases (prorated one, and next month's), which can throw off some assertions later on + Timecop.travel(Date.new(2016, 3, 20)) + + # user has no test drives, no credit card on file, but attempts to book a lesson + booking = LessonBooking.book_normal(user, teacher_user, valid_recurring_slots, "Hey I've heard of you before.", true, LessonBooking::PAYMENT_STYLE_MONTHLY, 60) + booking.errors.any?.should be_false + booking.card_presumed_ok.should be_false + booking.user.should eql user + booking.card_presumed_ok.should be_false + booking.should eql user.unprocessed_normal_lesson + booking.sent_notices.should be_false + booking.booked_price.should eql 30.00 + + ########## Need validate their credit card + token = create_stripe_token + result = user.payment_update({token: token, zip: '78759', normal: true, booking_id: booking.id}) + booking.reload + booking.card_presumed_ok.should be_true + booking.errors.any?.should be_false + booking = result[:lesson] + lesson = booking.lesson_sessions[0] + lesson.errors.any?.should be_false + + booking.sent_notices.should be_true + lesson.music_session.scheduled_start.should eql booking.default_slot.scheduled_time(0) + lesson.amount_charged.should be 0.0 + lesson.reload + + user.reload + user.stripe_customer_id.should_not be nil + user.remaining_test_drives.should eql 0 + user.lesson_purchases.length.should eql 0 + + customer = Stripe::Customer.retrieve(user.stripe_customer_id) + customer.email.should eql user.email + + booking.lesson_sessions.length.should eql 1 + lesson_session = booking.lesson_sessions[0] + lesson_session.status.should eql LessonBooking::STATUS_REQUESTED + booking.status.should eql LessonBooking::STATUS_REQUESTED + + ######### Teacher counters with new slot + teacher_countered_slot = FactoryGirl.build(:lesson_booking_slot_recurring, hour: 14, update_all: true) + UserMailer.deliveries.clear + lesson_session.counter({proposer: teacher_user, slot: teacher_countered_slot, message: 'Does this work?'}) + booking.reload + booking.errors.any?.should be false + lesson_session.lesson_booking.errors.any?.should be false + lesson_session.lesson_booking_slots.length.should eql 1 + lesson_session.lesson_booking_slots[0].proposer.should eql teacher_user + teacher_counter = lesson_session.lesson_booking_slots.order(:created_at).last + teacher_counter.should eql teacher_countered_slot + teacher_counter.proposer.should eql teacher_user + booking.lesson_booking_slots.length.should eql 3 + UserMailer.deliveries.length.should eql 1 + chat = ChatMessage.unscoped.order(:created_at).last + chat.channel.should eql ChatMessage::CHANNEL_LESSON + chat.message.should eql 'Does this work?' + chat.user.should eql teacher_user + chat.target_user.should eql user + notification = Notification.unscoped.order(:created_at).last + notification.session_id.should eql lesson_session.music_session.id + notification.student_directed.should eql true + notification.purpose.should eql 'counter' + notification.description.should eql NotificationTypes::LESSON_MESSAGE + + ######### Student counters with new slot + student_countered_slot = FactoryGirl.build(:lesson_booking_slot_recurring, hour: 16, update_all: true) + UserMailer.deliveries.clear + lesson_session.counter({proposer: user, slot: student_countered_slot, message: 'Does this work better?'}) + lesson_session.errors.any?.should be false + lesson_session.lesson_booking.errors.any?.should be false + lesson_session.lesson_booking_slots.length.should eql 2 + student_counter = booking.lesson_booking_slots.order(:created_at).last + student_counter.proposer.should eql user + booking.reload + booking.lesson_booking_slots.length.should eql 4 + UserMailer.deliveries.length.should eql 1 + chat = ChatMessage.unscoped.order(:created_at).last + chat.message.should eql 'Does this work better?' + chat.channel.should eql ChatMessage::CHANNEL_LESSON + chat.user.should eql user + chat.target_user.should eql teacher_user + notification = Notification.unscoped.order(:created_at).last + notification.session_id.should eql lesson_session.music_session.id + notification.student_directed.should eql false + notification.purpose.should eql 'counter' + notification.description.should eql NotificationTypes::LESSON_MESSAGE + + ######## Teacher accepts slot + UserMailer.deliveries.clear + lesson_session.accept({message: 'Yeah I got this', slot: student_counter.id, update_all: false, accepter: teacher_user}) + UserMailer.deliveries.each do |del| + # puts del.inspect + end + # get acceptance emails, as well as 'your stuff is accepted' + UserMailer.deliveries.length.should eql 2 + lesson_session.errors.any?.should be_false + lesson_session.reload + lesson_session.slot.should eql student_counter + lesson_session.status.should eql LessonSession::STATUS_APPROVED + booking.reload + booking.default_slot.should eql student_counter + lesson_session.music_session.scheduled_start.should eql booking.default_slot.scheduled_time(0) + booking.status.should eql LessonBooking::STATUS_APPROVED + + UserMailer.deliveries.length.should eql 2 + chat = ChatMessage.unscoped.order(:created_at).last + chat.message.should eql 'Yeah I got this' + chat.purpose.should eql 'Lesson Approved' + chat.channel.should eql ChatMessage::CHANNEL_LESSON + chat.user.should eql teacher_user + chat.target_user.should eql user + notification = Notification.unscoped.order(:created_at).last + notification.session_id.should eql lesson_session.music_session.id + notification.student_directed.should eql true + notification.purpose.should eql 'accept' + notification.description.should eql NotificationTypes::LESSON_MESSAGE + + + # teacher & student get into session + start = lesson_session.scheduled_start + end_time = lesson_session.scheduled_start + (60 * lesson_session.duration) + uh2 = FactoryGirl.create(:music_session_user_history, user: teacher_user, history: lesson_session.music_session, created_at: start, session_removed_at: end_time) + # artificially end the session, which is covered by other background jobs + lesson_session.music_session.session_removed_at = end_time + lesson_session.music_session.save! + + Timecop.travel(end_time + 1) + + LessonSession.hourly_check + lesson_session.reload + lesson_session.analysed.should be_true + analysis = lesson_session.analysis + analysis["reason"].should eql LessonSessionAnalyser::STUDENT_FAULT + analysis["student"].should eql LessonSessionAnalyser::NO_SHOW + if lesson_session.billing_error_detail + puts "monthly recurring lesson flow #{lesson_session.billing_error_detail}" # this should not occur, but helps a great deal if a regression occurs and running all the tests + end + + # let user pay for it + LessonBooking.hourly_check + + booked_price = booking.booked_price + prorated = booked_price / 2 + prorated_cents = (booked_price * 100).to_i + user.reload + user.lesson_purchases.length.should eql 1 + lesson_purchase = user.lesson_purchases[0] + puts "LESSON_PURCHASE PRICE #{lesson_purchase.price}" + lesson_purchase.price.should eql prorated + lesson_purchase.lesson_package_type.is_normal?.should eql true + lesson_purchase.price_in_cents.should eql prorated_cents + teacher_distribution = lesson_purchase.teacher_distribution + teacher_distribution.amount_in_cents.should eql prorated_cents + teacher_distribution.ready.should be_true + teacher_distribution.distributed.should be_false + education_distribution = lesson_purchase.education_distribution + education_distribution.amount_in_cents.should eql (prorated_cents * 0.0625).round + education_distribution.ready.should be_true + education_distribution.distributed.should be_false + user.sales.length.should eql 1 + sale = user.sales.first + sale.stripe_charge_id.should_not be_nil + sale.recurly_tax_in_cents.should eql (100 * prorated * 0.0825).round.to_i + sale.recurly_total_in_cents.should eql ((prorated * 100 * 0.0825).round + 100 * prorated).to_i + sale.recurly_subtotal_in_cents.should eql prorated_cents + sale.recurly_currency.should eql 'USD' + sale.stripe_charge_id.should_not be_nil + line_item = sale.sale_line_items[0] + line_item.quantity.should eql 1 + line_item.product_type.should eql SaleLineItem::LESSON + line_item.product_id.should eq LessonPackageType.single.id + line_item.lesson_package_purchase.should eql lesson_purchase + lesson_purchase.sale_line_item.should eql line_item + + TeacherPayment.count.should eql 0 + TeacherPayment.hourly_check + teacher_distribution.reload + teacher_distribution.distributed.should be_true + TeacherPayment.count.should eql 2 + payment = teacher_distribution.teacher_payment + payment.amount_in_cents.should eql 3000 + payment.fee_in_cents.should eql (3000 * 0.28).round + payment.teacher_payment_charge.amount_in_cents.should eql (3000 + 3000 * APP_CONFIG.stripe[:ach_pct]).round + payment.teacher_payment_charge.fee_in_cents.should eql (3000 * 0.28).round + payment.teacher.should eql teacher_user + payment.teacher_distribution.should eql teacher_distribution + education_distribution.reload + education_distribution.distributed.should be_true + + education_amt = (3000 * 0.0625).round + payment = education_distribution.teacher_payment + payment.amount_in_cents.should eql education_amt + payment.fee_in_cents.should eql 0 + payment.teacher_payment_charge.amount_in_cents.should eql (education_amt + education_amt * APP_CONFIG.stripe[:ach_pct]).round + payment.teacher_payment_charge.fee_in_cents.should eql 0 + payment.teacher.should eql teacher_user + payment.teacher_distribution.should eql education_distribution + + + # teacher & student get into session start = lesson_session.scheduled_start end_time = lesson_session.scheduled_start + (60 * lesson_session.duration) @@ -422,6 +670,7 @@ describe "Monthly Recurring Lesson Flow" do end + it "affiliate gets their cut" do Timecop.travel(2016, 05, 15) user.affiliate_referral = affiliate_partner diff --git a/ruby/spec/jam_ruby/flows/normal_lesson_spec.rb b/ruby/spec/jam_ruby/flows/normal_lesson_spec.rb index da9a65fe7..71192bccc 100644 --- a/ruby/spec/jam_ruby/flows/normal_lesson_spec.rb +++ b/ruby/spec/jam_ruby/flows/normal_lesson_spec.rb @@ -266,12 +266,16 @@ describe "Normal Lesson Flow" do it "works" do + # set up teacher stripe acct + teacher.stripe_account_id = stripe_account1_id + # user has no test drives, no credit card on file, but attempts to book a lesson booking = LessonBooking.book_normal(user, teacher_user, valid_single_slots, "Hey I've heard of you before.", false, LessonBooking::PAYMENT_STYLE_SINGLE, 60) booking.errors.any?.should be_false booking.card_presumed_ok.should be_false booking.user.should eql user booking.card_presumed_ok.should be_false + booking.same_school_free.should be_false booking.should eql user.unprocessed_normal_lesson booking.sent_notices.should be_false booking.booked_price.should eql 30.00 @@ -293,6 +297,7 @@ describe "Normal Lesson Flow" do user.stripe_customer_id.should_not be nil user.remaining_test_drives.should eql 0 user.lesson_purchases.length.should eql 0 + teacher_user.stripe_auth.should_not be_nil customer = Stripe::Customer.retrieve(user.stripe_customer_id) customer.email.should eql user.email @@ -389,6 +394,7 @@ describe "Normal Lesson Flow" do UserMailer.deliveries.clear # background code comes around and analyses the session LessonSession.hourly_check + lesson_session.reload lesson_session.analysed.should be_true analysis = lesson_session.analysis @@ -397,6 +403,17 @@ describe "Normal Lesson Flow" do if lesson_session.billing_error_detail puts "testdrive flow #{lesson_session.billing_error_detail}" # this should not occur, but helps a great deal if a regression occurs and running all the tests end + + TeacherPayment.count.should eql 0 + TeacherPayment.hourly_check + TeacherPayment.count.should eql 1 + + + teacher_distribution = lesson_session.teacher_distribution + teacher_distribution.ready.should be_true + teacher_distribution.distributed.should be_true + education_distribution = lesson_session.education_distribution + education_distribution.should be_nil lesson_session.billed.should be true user.reload user.lesson_purchases.length.should eql 1 @@ -423,7 +440,7 @@ describe "Normal Lesson Flow" do lesson_session.sent_billing_notices.should be true user.reload user.remaining_test_drives.should eql 0 - UserMailer.deliveries.length.should eql 2 # one for student, one for teacher + UserMailer.deliveries.length.should eql 3 # one for student, one for teacher end @@ -568,6 +585,224 @@ describe "Normal Lesson Flow" do TeacherDistribution.count.should eql 0 end + + it "works (school on school education)" do + + # make sure teacher can get payments + teacher.stripe_account_id = stripe_account1_id + school.user.stripe_account_id = stripe_account2_id + + # make sure can get stripe payments + + # get user and teacher into same school + + school.education = true + school.save! + user.school = school + user.save! + teacher.school = school + teacher.save! + + # user has no test drives, no credit card on file, but attempts to book a lesson + booking = LessonBooking.book_normal(user, teacher_user, valid_single_slots, "Hey I've heard of you before.", false, LessonBooking::PAYMENT_STYLE_SINGLE, 60) + booking.errors.any?.should be_false + booking.school.should be_true + booking.card_presumed_ok.should be_false + booking.user.should eql user + user.unprocessed_normal_lesson.should be_nil + booking.sent_notices.should be_false + booking.booked_price.should eql 30.00 + booking.is_requested?.should be_true + booking.lesson_sessions[0].music_session.scheduled_start.should eql booking.default_slot.scheduled_time(0) + LessonPaymentCharge.count.should eql 1 + + + ########## Need validate their credit card + token = create_stripe_token + result = user.payment_update({token: token, zip: '78759', normal: true, booking_id: booking.id}) + booking = result[:lesson] + lesson = booking.lesson_sessions[0] + booking.errors.any?.should be_false + lesson.errors.any?.should be_false + booking.card_presumed_ok.should be_true + booking.sent_notices.should be_true + lesson.music_session.scheduled_start.should eql booking.default_slot.scheduled_time(0) + lesson.amount_charged.should eql 0.0 + lesson.reload + + user.reload + user.stripe_customer_id.should_not be nil + user.remaining_test_drives.should eql 0 + user.lesson_purchases.length.should eql 0 + + customer = Stripe::Customer.retrieve(user.stripe_customer_id) + customer.email.should eql user.email + + booking.lesson_sessions.length.should eql 1 + lesson_session = booking.lesson_sessions[0] + lesson_session.status.should eql LessonBooking::STATUS_REQUESTED + booking.status.should eql LessonBooking::STATUS_REQUESTED + + ######### Teacher counters with new slot + teacher_countered_slot = FactoryGirl.build(:lesson_booking_slot_single, hour: 14) + UserMailer.deliveries.clear + lesson_session.counter({proposer: teacher_user, slot: teacher_countered_slot, message: 'Does this work?'}) + booking.reload + booking.errors.any?.should be false + lesson_session.lesson_booking.errors.any?.should be false + lesson_session.lesson_booking_slots.length.should eql 1 + lesson_session.lesson_booking_slots[0].proposer.should eql teacher_user + teacher_counter = lesson_session.lesson_booking_slots.order(:created_at).last + teacher_counter.should eql teacher_countered_slot + teacher_counter.proposer.should eql teacher_user + booking.lesson_booking_slots.length.should eql 3 + UserMailer.deliveries.length.should eql 1 + chat = ChatMessage.unscoped.order(:created_at).last + chat.channel.should eql ChatMessage::CHANNEL_LESSON + chat.message.should eql 'Does this work?' + chat.user.should eql teacher_user + chat.target_user.should eql user + notification = Notification.unscoped.order(:created_at).last + notification.session_id.should eql lesson_session.music_session.id + notification.student_directed.should eql true + notification.purpose.should eql 'counter' + notification.description.should eql NotificationTypes::LESSON_MESSAGE + + ######### Student counters with new slot + student_countered_slot = FactoryGirl.build(:lesson_booking_slot_single, hour: 16) + UserMailer.deliveries.clear + lesson_session.counter({proposer: user, slot: student_countered_slot, message: 'Does this work better?'}) + lesson_session.errors.any?.should be false + lesson_session.lesson_booking.errors.any?.should be false + lesson_session.lesson_booking_slots.length.should eql 2 + student_counter = booking.lesson_booking_slots.order(:created_at).last + student_counter.proposer.should eql user + booking.reload + booking.lesson_booking_slots.length.should eql 4 + UserMailer.deliveries.length.should eql 1 + chat = ChatMessage.unscoped.order(:created_at).last + chat.message.should eql 'Does this work better?' + chat.channel.should eql ChatMessage::CHANNEL_LESSON + chat.user.should eql user + chat.target_user.should eql teacher_user + notification = Notification.unscoped.order(:created_at).last + notification.session_id.should eql lesson_session.music_session.id + notification.student_directed.should eql false + notification.purpose.should eql 'counter' + notification.description.should eql NotificationTypes::LESSON_MESSAGE + + ######## Teacher accepts slot + UserMailer.deliveries.clear + + lesson_session.accept({message: 'Yeah I got this', slot: student_counter.id, update_all: false, accepter: teacher_user}) + lesson_session.errors.any?.should be_false + lesson_session.reload + lesson_session.slot.should eql student_counter + lesson_session.status.should eql LessonSession::STATUS_APPROVED + booking.reload + booking.default_slot.should eql student_counter + lesson_session.music_session.scheduled_start.should eql booking.default_slot.scheduled_time(0) + booking.status.should eql LessonBooking::STATUS_APPROVED + + UserMailer.deliveries.length.should eql 2 + chat = ChatMessage.unscoped.order(:created_at).last + chat.message.should eql 'Yeah I got this' + chat.purpose.should eql 'Lesson Approved' + chat.channel.should eql ChatMessage::CHANNEL_LESSON + chat.user.should eql teacher_user + chat.target_user.should eql user + notification = Notification.unscoped.order(:created_at).last + notification.session_id.should eql lesson_session.music_session.id + notification.student_directed.should eql true + notification.purpose.should eql 'accept' + notification.description.should eql NotificationTypes::LESSON_MESSAGE + + # teacher & student get into session + start = lesson_session.scheduled_start + end_time = lesson_session.scheduled_start + (60 * lesson_session.duration) + uh2 = FactoryGirl.create(:music_session_user_history, user: teacher_user, history: lesson_session.music_session, created_at: start, session_removed_at: end_time) + # artificially end the session, which is covered by other background jobs + lesson_session.music_session.session_removed_at = end_time + lesson_session.music_session.save! + + Timecop.travel(end_time + 1) + + UserMailer.deliveries.clear + # background code comes around and analyses the session + LessonSession.hourly_check + lesson_session.reload + lesson_session.analysed.should be_true + analysis = lesson_session.analysis + analysis["reason"].should eql LessonSessionAnalyser::STUDENT_FAULT + analysis["student"].should eql LessonSessionAnalyser::NO_SHOW + lesson_session.billed.should be_true + if lesson_session.billing_error_detail + puts "testdrive flow #{lesson_session.billing_error_detail}" # this should not occur, but helps a great deal if a regression occurs and running all the tests + end + lesson_session.billing_attempts.should eql 1 + user.reload + user.lesson_purchases.length.should eql 1 + + LessonBooking.hourly_check + + lesson_session.reload + teacher_distribution = lesson_session.teacher_distribution + teacher_distribution.amount_in_cents.should eql 3000 + teacher_distribution.ready.should be_true + teacher_distribution.distributed.should be_false + + lesson_session.teacher_distributions.count.should eql 2 + education_distribution = lesson_session.education_distribution + education_distribution.amount_in_cents.should eql (3000 * 0.0625).round + education_distribution.ready.should be_true + education_distribution.distributed.should be_false + + lesson_session.billed.should be true + user.reload + user.lesson_purchases.length.should eql 1 + user.sales.length.should eql 1 + lesson_session.amount_charged.should eql 32.48 + lesson_session.billing_error_reason.should be_nil + lesson_session.sent_billing_notices.should be_true + user.reload + user.remaining_test_drives.should eql 0 + UserMailer.deliveries.length.should eql 2 # one for student, one for teacher + + TeacherPayment.count.should eql 0 + TeacherPayment.hourly_check + TeacherPayment.count.should eql 2 + + LessonPaymentCharge.count.should eql 1 + TeacherDistribution.count.should eql 2 + + + teacher_distribution.reload + teacher_distribution.distributed.should be_true + education_distribution.reload + education_distribution.distributed.should be_true + + education_amt = (3000 * 0.0625).round + payment = education_distribution.teacher_payment + payment.amount_in_cents.should eql education_amt + payment.fee_in_cents.should eql 0 + payment.teacher_payment_charge.amount_in_cents.should eql (education_amt + education_amt * APP_CONFIG.stripe[:ach_pct]).round + payment.teacher_payment_charge.fee_in_cents.should eql 0 + payment.teacher.should eql teacher_user + payment.teacher_distribution.should eql education_distribution + payment = teacher_distribution.teacher_payment + payment.amount_in_cents.should eql 3000 + payment.fee_in_cents.should eql (3000 * 0.28).round + payment.teacher_payment_charge.amount_in_cents.should eql (3000 + 3000 * APP_CONFIG.stripe[:ach_pct]).round + payment.teacher_payment_charge.fee_in_cents.should eql (3000 * 0.28).round + payment.teacher.should eql teacher_user + payment.teacher_distribution.should eql teacher_distribution + lesson_session.lesson_booking.status.should eql LessonBooking::STATUS_COMPLETED + lesson_session.lesson_booking.success.should be_true + + + + end + it "affiliate gets their cut" do user.affiliate_referral = affiliate_partner user.save! diff --git a/web/app/assets/images/landing/Scott Himel - Avatar.png b/web/app/assets/images/landing/Scott Himel - Avatar.png new file mode 100644 index 0000000000000000000000000000000000000000..4b81238165a210a356b6ce796135b8e0f18280e0 GIT binary patch literal 16637 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 M07*qoM6N<$f=DLea{vGU literal 0 HcmV?d00001 diff --git a/web/app/assets/images/landing/Scott Himel - Speech Bubble.png b/web/app/assets/images/landing/Scott Himel - Speech Bubble.png new file mode 100644 index 0000000000000000000000000000000000000000..06dc9110edefeda0a5e0c9a7fe247a1d50e520fb GIT binary patch literal 43291 zcmZ^r1ymf{vaoS?cV}>i0KpmDgS)%Cy9^G&HMj)`5Q4h}51!zz!7aG_lXLFPIq$9a z!(zeguG%GCyQh19HAJf@NuweWAwfVupvuZfs6s$MbwWTuG9W;KM=*6zrNO@--BhK; zA!;T_eu7^hI?L#|K|mm5|Neo5$j&8zfPewmsB61xD=NG-b8=ucF?TYxVD)xz21`Rg z2ztK-|LI`iZbIShVDISm)?0|`FNwF{zkd(2QBnLQ;%+BIrLCw!0d#V;px|NUW@V=m zMxvmg5Og)Se5)!U^&fTcDc1!X?>rI~Zf34F&h9o&jugM=H8FMaa2KMY`fcdX*WZ4++gSc%$?uiZXTw#7H01MI$z+k_E+_bn^>{^Ygmx&|CAO4*TP#xCvzK1 z9|;q83t>)njyEjq{4DHT>YVIv+4caGuWqiZ*F3+|4+37NmzJlUXFg}ET=|baXX847`(9mcd*f$M6K79obYt}lVe+mY zu3s9s>$Yz2d+OyP%+R}s`mUe12>=V_4p4a!=W|P!CJ-$>@WmSC?Q*7!CZPL z8HQ)pYlA+DcEi{<>bBaB=Pys+qHjSyyfvH_Wfd}ETAJbi(mAH+ak+WbcUuYzJIPox zjw*m`?d^8hzCeT)v`Z(b47RZRd-C5N77S2rwA5RCJ!R85dX=V&Y}oD$+l9KASg;TjlPy?4il8 zB8QLigpYoYVElfO!KIhHYjyD_9mWVaJW#Ie6lA@D5dk}ANu432IYL!FTZ~y$AVv{U6lK#+pya@=FG2GKdE@rd>L(_7zm>86n-`+omjc zR;NOuk&yt*|KwXWESR~yD+?Amd}EFDLNKGd%C9ufOfi&S7?DGE2ad!0e6d~7u4^t8 zQ>n^dHzQ0U0dADez{9}?0>aKqKF`>4j4Dme-1-dnrOVxK?(Jj7(W?XlCInBF| zf}Q)BmnURerrN)2^1s!^2@-udZcd0lVv;YKVO^jRE$Oih!wM6PTY)&6_G^EWu0*D> zUom&&0pPBHG%@*4MH?fe%EC~*B?;)vXtVK;kmD(PDY}s%{h|apD;GbdQlrQV7RNOI zm$(MZ`PU&Yqt&-Euh`}6w(;MC=jxutJ;!E6t2)p9Z@{*PS#DhB3hfx1x z+5`#+LWtzxw$JaeDOe~#!>D`|V>DxO^}EMcm%1y(EA@Y08~#2Itsn>*$YJPd%`wg- zyo!|#!+S~YUUOH&`2JlKNpktZV1jKN$~3UX?Wg?Y8%h@#2OtV)79}0>Ho-p zFF0Z_+?Nm~u)`=F`{kvsJ>@-=>K`2iUO9KuVgI#ah84kuBFd<;gk}TD2~EDx^e$Sw zXYm@XNv80B*ephH&Mp3Va@Yj4-1z8If@Sy7s}Rfbzw7RI1g?aTb_0quu)n7fRA|zm z&v-aSqD}rE#=t(QLYl*oSs7P`U@*?Btk<*usa^so{@7p@e%o~j3<|D+G1Tv_c%(m^ z{}dZL%p3wuGI0W_ToUlZK;NGwZ;Y^m1Et%#xj<w zX?ts;8r{awG2{6Hy={(#XcWXFdQp*zUB%>&-SnafkP33Rhy z%J(cVg2j(29BnH@c3&jF#7#3C&Ks>XjeKtoqnzTa`t;Q20E(#_FDLmOGR=S%CVtCG z3NaQ`AJt#wDvF1J!Tj{oMOQ&KS&0PJMTy-Fm(kXaL$8tJxNCs=eXMI36{~ZatI|5f zobdb$f(|ZTCTsIRcW#^*5J7v{DSs-6$oIgqzn%18dGt^7#Q7 z-%!(Wua-z=_i6k7gjJj-Xd=SLiFK}|et9NJ)NvHmBwG8OVCo=U2HB*3{M#RBtFugF zavU&noKWd_uPiplVhI;)*=RN4S8NQ39iQjBX#^uUd!UWrmW*2vEs?cOxl>hf&_B|* zC}sPv4G~RDXLeugoKR#5>PH?kETjq zx#K0WCNjHFa4CJ_<=6IQ$CTny zYebcQncFq}=_=m3iPp;}%`uu;fd>jKPrdhn^GW7C{4Je9)0MPBO zSf804+N>{QyK64HI3SXmBJ+57+Z9t{CZnCU>NcFJN}=2N6SgOX=UwID?S{zmFcW3< zc(X=7r1J)LmC0Odl0#2FAp&bsy0WmLkVT4+i-!AlHG0fObLwcsJY_E@19@9qDLtcx zG0xsEn(j_im~eH$Xh7yXE0{=8mBO zlrW`V7wx)*byp`ND~aOZ5g8tOZ%K|bG)6qHZ7ey3R&}A&7*R?-b+{x5%Ex*(O+2^6 zr19LF8NyIU!KMe0X|pRn`C*4t`Ac?KG?B4cM;&#e-VUOQm_p&wVA@?jl6}ht)+25m%5pFfDmrmJ;dHdYAp?-2`AM7rq zFYV?(WVF^+)BHdQCq#{Iph&}HBBU(#WRd1YLO9f7+nC$G#;emHg%u(>`}_rv3G>D5 z0OzH;&14Xz3xPf&#-BU^^Yu;#Z6s+xqS#eq`MHzj(@RF$V7e+5KO--n)cb(UY-DnI zms`)Zv#;v?T-Vb**%q59MRe!=TD_=MV~RQx8Z~>QtMlF0T&2ui&UqZq>_|DacAq55 z(7dID(fXZsDA)H!twx8?fiFETw6`1Z7igKaUHl#wFdvh5NWU+4AG^`YzV#XB3M@Fj z(iIS_l%S&UTd}4_9QcS$0p|k}VkD*FlJuu;MM@j^pf@l=J+S^mbWoh(*k3Ir2Jy&} zqAYa}u;KQrTkpw_x+nzY=G!P;q8LSwcjZWw-p~AQ!D8Q7y})8w?|j7xS8ds}+ZSqG z=8JpTI7|Sgn6II)>c{L_Rn#wr2=sSi<^zs6oApOLjV13SfW1===gVwUNjp(7utmW0 zawjCR?p1#8qN$dwY<1^nx!b8o8x$)qXH9`N_$KB)KNyH{;%*4%sw-(DnCGaG`m@!f zuBtKKPWyjeSkC;=QI1s_{uGiNM{xPLrF+ot5U0?qf5}iXrTQFla zNE}x&^xgHfh&yWZxD#!sGNc+`;q>>H2=W|Hr`xWp(9V4sk6i+ojx&^`PO@boWr+y5 zl#zp2j3>tsKW}dhd~AZKWP++q&PcT6Ln1ep++tT?$n}F5ebco(EyDv zwU(REd!&yj19}Lkds151Mnd}rBzLyyXICQyAYP;Hm7c}pAL*nlpH6WPjjZbh>eMl{ zAF{k=V#6m=Gf>7*jqlR(GQCWFtsLg#1-@9G=lHz9lABEI=iFpBdeEh;W>t1_fAg3T zs^jXKeNS*K1QP!iJS`{O!B%G);xx)cA?Ye9{7%{b~biduW1lXbSC>Td%{=8rtnJ%+Z{|*UJYKaPzdF{74=|MHC-)ryZ{vOwQ zM}ys@zCN(j%bon^FrFA4`9p+Kh zlfm`$Wi8~rVm;kaJdtYU^2X#ke0R=dzRv8-)0?X_-gg@0isetmSIcBRYrgx?ndMub zt~;(J&iB*Sn&HHd5q2d~lk-mZhnaZq?W`*gB8QgBkk89;D8d*^psqx&l}ID>3VUf2 zx{B}LqEhsmqzwsJ(5zX%&gcL_nr}&qceLPDxurjR(_R<`@=EDQI|7w^U+&mvLYf`L z;kk_b)9xSMY!cCoT#c$>5QVp)Iv70IR`Q%v1y3xz&?lg6htCwP!Af-8_r zwMTx-(BBTcG5oo(nF&>yQ_T+Hs{*&h zc70+U8;ag=n$GvN{cM}JPaGH~<)f{x3PT->inn_Au>~0(mE&j5#hY-r)P`G9hgN=5 z2dhS4iCfoA>roQkl*l6h#iN5y<0E}MmE0mX6o%o&g_|JPg!z}*Es64H@#Y?M`I7!e z=vd*;D~lSGc3sD91SYB5;jyfd=AcbnpMjGgnp9#G3ed!xZHM<*6RpGdTaTN~J*UAa zArspHcI<6MeQ|lgLA~5~f3;NdkU+16`=S(?7>_6*kRS@_&^jcP;ZZlkk+osgw_OtXBLyQ@ zHinXYVlTex_#twZ8(S9_74yWk4sh%p#~b2uvW8OyvV}GvSLNSR$ea(sBpSYHm&(FV znEV{XZ-cM1z}0l?Erv-XW9T1G^rkGr{)GHpI2;kRzCSKhCbU?Dq#4pHaWhdQ)gF^0 z!Ytw^7d$12H0UpclGX*&;+-IF3R0SsOL5lPWsyj4s6mBc*Qy_cI4}-fz7FD)nmM1! zvKXLK(o-tT?j?9>!C`m(~ln{g-R#U z8C8NC4JtYcxPH5$t2eX&EjC1_W(iJi(z;CWlAMzUlxR@m|%#P+F zYlA|Xq=0PV)_hQ~);taFt}l5bs7tKD%}E`DpYg}>t;0V(ZY-O_)#lOttXrUY$+6HRAF4=7ZE z^-OBuRs9k?2V=4;%0+YJ^nh6$L#3kjUe>_lP@P@56r+M^1_MnMqj_~crAnPg7`o9E zlHy6nBMKz?E9@TgQf(KTCDZUWwibs&?v=ynJC!iBu%G`hPgk;H3Z0G{_ae&bVbB3+ z_;AGjfPo(7o1)&5I6%J+{i^GwdVjZ^olmqy-Q1eis$R4nAJVhsz5YAKI@dxgW2^ek zSOZL$@g#^xaxu~M68dC;=hw^WFl}8x@y>MElNcwQxC4XTk#@&I~_56WwS35;IcGR%aZP2k_KzNefy3Vdfe zjqxdCfg(RoG+Rt~#sTfDACep~50IR~O{XhHM7fGCgu3)GmcSRuR&`+lZUmRL;bZID z&(Xa|u=)OS)mM@|a?<(Jb>>t|b9Nc<^8v9oX`j^2!tJDN16?V{cR*_AshcQ00w(lt z?s}uL6Nm=fEF@SopHNIBb2W*~o;05P&pX`i;Olm;gMj?Vd|=XPjPc9zh8YLP zN5w1_chz+kH&b#SO9z-{r?_LxGxq5lr<&unDd56vTPfL{DxH47*y4nCA`Wn~6*)zv zEArBuppT#~7t(z%tx@Co3 z7t%vZ1^9RJse5mh=14M{)Pc&BWiB1Tu$;rF+%rp`1$f+}MzC8suBi|dYa&*oZ@-C& z9ruT~jvQLt>C`wuBWpg76(?nn%>@B?ac;K>ys?BxuyXO zzEN~VnTrV>C93ty43CWjV@oOcW|d2?`EsN z5hwa1A(6R_puV?6?acM8Hux90t=P$0w0R0+XWgj`v}D6pg@R_XVld9HxMVfN12!xh z#q?LRUSyosVQ5JL%T0Cby0yUk?R!MYLW{3^=ISuGNh8~%9YU!@l-k^`CW4Xv4l~7d zY(|MWW6Yi+OAb566j>cgeng*LdoIOvx>1B8=n3kNeOl>m=Fc@ILlqSAw!1zo#E^W$ zK(x4|>d}dH+u?pXkYmk-v{g)`ZrmCE>!gN(h-uXk(J@Ac%3AoNsuF8;$WMbYNbdq& zo~F)n9vDeB25=c4qB@Xngp2FeiFjoFUMZ2s3y}xy<{lFHpdJDYe%$xC^=@Gf$K-%F z3RoTQLI$rI`^GkHaAalp`(uR(W ziBh8h;bjhq2LStQir=gDt~ z!d^Tr{@PX>GmI-NFW_E(9m(l6>Ka0hRs7Nv39oCs81Hf%SsV3bc!B8(9}?7dLk6VR zXt|4{&DZl%aHL<`M-4hFJjr(cTH&HkO^Rr@io0um;gYVkwp7Mc8TO1H?&W=4s9`3K zo*4e3yk3?^^>e=At_A5kj<76D>_topT(yP!A#gER>$s#mvgBLEs!eM#wp_os-qWrh zD&bv4WQM6kpCz#&M&C#9zS|U!xBLz0>&be^7q<5y0Y$&M6B(~Jj#5B8miL#_(Au#KvOS8rn_EiB5VGW#|IY7D(FDY3NluWa(T zUy@ND3O^v9(<_L4{}@H^GjJ4<@0=W08GBjSWFXS}^_bz}qcgqqFaH?%=sQ6RhQS3j zghmqKUjgI^QW&Q*KhdZkzib}>5Y|&OcwB=t4Pn0ab`1Kkx|^Lt$^ANyxq68+d48Tw9QeOeGq1*C&j8Yzbk{KUw=^36P07DtcVe# zrqgivZlAZU4qJq=0Vf6z(=NSS9g%m-iAW3;Z!by;v;YF2yF^h;Fww z=z*!BFIi`I_(7q1d=uNijVT)MZ^e*z{e{#F4O=gZDadWjB^TyHJ=Yu@y91N z%`jm$Q*v5*$!?-Uv^=S*-NrE`*8vw%B4cef*!o*vAudmlv{WYY0Ihe zsS|}2hriX7pQ3`7gZ6oQxY^;y?dZELF=KR3& zA=NWJfGuBDlkOdW_sSHliVy849NiHKQ-%yH-!C2d9J{d6lJzS{Sw-gDV91mtSGaeF zgspa|JYgCiGP3(UG$hriZ3;LXkjQ#qH z0=FLB62AN$6POl6L%?PfHHU?Rhc!P~f%$+GkbIC+c)y%leSb;}1Zjtpj}wb0`Uwac zc|#(Ch;I8Rsx_h1!zx!R{B2tNgrtfHCBw-gn(|1OmvoOjhf#4;!!vqi5-2Ud__iWb zZp4M>Y?B++Wr)1an#p?$ZG71nmy&!<`T1$tuL~z-{Xp?PW@3MxGQY z)&c&$!qXp)mktkC(a?#?y$d+U(s(z|Y1Ye~wt{izi+Pt{ZcFY#0`VM$JA1H?Dby6S zJp+(yNf&CW8+$7=*P6NI5d_bEVU$s##*z$mhh+CH;_=rrT2|ge;kod{i#F9NGI%{= zYUei~S;lITjXshyYD@)wGy#;lEQ2v>oH%!pe5(tgFH+ugz(pPVvWuXA(#bxw zp+cQ8q`a&k-{de|E}L>WTpY*G0T^;dra$mNfq@ zYdk%3giI& zc=yAU-{yxMOTHmQf=YO*YqG92mluF=s`p9hYT~wojfN2rDYOD857>v$J#~2DRdw<) zX@GZ>80@%%`<1Q+Com7Wd#0j)86cq6H8ieyvL(2F7Y4-QDq*>RU_U__nc72(p}V8J z_Wbymp%PpD0a%IPFEm7te)x3I@8dMyuR|$E)0O00gVelx$YCJMLeqmhkwm`u*0bE! z-+VAhJX5oX(pE!`QUV3gzf7E0-TF?=)j#QoMqS5QE6xesQ>XyjHr(=g6+O=?I;`w{ zE$qx^-Y1Aw!O`sRrv&V4{KkSCq4^L8L}A^vVN(#@b2pKB9tj_S6WAlA^80EC<9_7X z@8Zy%zhj*3LrYX-sCE#!Q-+CJpG$5WyT5;dW=Z zWT!Mw^Y=IyBbS(<5M4i4R8wzwnAN?x7ZmRY*mg@zQTA&v2Au}6H;(##u)#_#d0IX+ zA#-ZIV2yLJ!J0OR%jJvAdcNq_CdPAys6itcCd_91$!c)W!x>Hsyd;Bb&=9>L#f8oL1dDO?e5VXioGSGr(lS0Z!=P8gqTLVb1?sHK^R8pz2&{2uFh#ViZJYR4}l-%0EJ;t z(Qv8+A0OS3i?0;K^Ga%Ru0U;L1;2%B7!fL-QZNKw=Es_ai|eClU>=sa`Mdw1E)_V; zsbN(64@D@#+t=Bt&dbCA!!rU z+YlRlskyHwcJ2MmA*W@^xv+6EXtl^Dz5&- zv_GI#l$Ek)2c+-2RQ>4>>jO7Y0C>$o^7`<0|d%>E)Gk8q@xG0SWoqMXh?AM{`Y=O<6ZHe8-_jBU6*Cakd_P^RCmus8+*U>BW6*DQH5*oZlxMf zOYgo+GEl~+CX%Ono^mD(D=FeA*^ETZPXFl*;bnz^R+zLf7*_?^==68MeJec5U z6@#Qbg1mhnSwaoZSJnB{_X)}6^qNb7vNfbuT_f5&1Wfl?PY(m|hjp{pwg`w$9&~Dl zF?zwI2h1E)2JW}iuQXV=ElLf7+I^dn4DP{u%>qXE5-GX>r^O=`0J$9=@h;)2^h#TF zt#0veswtD6#0YM;IExSQIin^9spypp19E^%U4$td6Q}eI_9NpeZ?91iKW{VTQG&2q zW~*q%d#K!SLY}ry#n45qH>$q7qU4!l$+^(YzrrjY6_7Kfr%>FbZsR&SVk19wo75t=2!)ojxzzawv6#hxV za2ntzbDnWVsqi+>C#=>lFrk6y8;bnovB&TSX~()!F!kio4z-v>gPPfVrWjbfst4A< zs4#qeWd8{hJDFZDhP4|YplEuIBZ#Bb)nFAla`Z!^QA~K(Eb?0Qhep7R!sP`uOi!?g zO+q+gO$s2N*CgiSM!5fu=vE2M=MYKq$9+Y~qEGT7S3J#t5!`6ByPi7m+wqR@*y}9J zfO&EvnZjU9T(o@fF=b3Qk`F13tZ<#4aQ!;YOvWJoq#&G3pSA`*DR7*?Pk_efwHqWr zX|Z(1v$Wn2&ojp=X#E`Z(YDWxd5M?k?CV<4wR#fSYh{^r*w0`7EV$3NgKe5{UKjge8RI8mf?B+sPgzP&Q2D;FPV7jv+h43dh^4)NmhPKh<->wgsczaJI&9>ND zF%gEYv)u%}dAIV=ethMuNet$3kJOXMU?4Z5Vjb*XW2q?dX6Oq0?g4*b2S2RFk(X-F z{~onz2sB93s`Ox~guwhH6XW03(t)I%JPF2=0KJ_-jC}9X=>;%aC=K)D%iEt6#?LvZ z_7cIPO#kpY)4g0LMhyn3Hx$!CpG#_%_7};#m%tb``z^RXF~!p{q-=uU7f(3wB?~*$ zE+aPR*_Ko9n_{-!vM>#I7YHXwBDul$mS%ZhIzNcZVei%Yzh;G({5 zYggm1uJSFe_XOR%EjPsWQAl8#DOQAJpgmpJU~P4@qCD#m%7k~f7L>Lpd!uE&GQQ?k zl5C5BaWSv4#tT;fMvhkBzByv^enMr=CeyzqCBUwGT5Kr&ByW`R6@)UAj{4H77IxGn ziG?9$RDbK6Ri$e15g+o~Q2|YKcXeMC<;%qvlH_Rq-f@i@+xG6}((kXSf`qX8be-5B z*dPPi%`ntAmFm1kvokLT6r-)6dPqx@PSW4Zmak)DW}@4oI|Cc0%Tj2whzXK8!@5>c zK`Zqix?G5UwO~6}nqR7jkGlWS3AF(^+?~2?5Bu`H6P}Mn@E7pC#>{4bRHOh;>}CMY-Sl=oL;MC$`LCE#7z7QF|l4 zzkl?`9VL%o!nndNO92FDh>Cu?=4J8{EJko~8BJXSUsFmrKEG;m^w0osV`yXf>I&Ut zROw}$&1Q3$^9FAUK7F#O$&c@a@UA$NZqm7epIHFdL7l%>Wcy4bi~**SvT|-tvl98J4#BUuGV^jlO*YAnxQC zF29~MIu$ec$v2V3qHpMPk>5SwB^^UNKYAJpb3Ge>8Rt)ew?rS0cb+ym;ErwN>oSyo z+Kb-T)Z_o_n{D4r$ZBvXyoBl0e<-f{H1^$Q)duMMZW;4Fqt;cz>5itlUEMkwnLN(_+GG=VENazkTFOzoI|K? z&+ccdl0?@IY^mqBBhl@!brxszGo}9ba+G)}&sFfZa*@Mud*f`G5$#6a1Y}~ONXyy5 zG+kCI_fbJFawS*V+gQ-!1U>>3alcWnkINn7_X0C)ua|i85@qRbjy{WdJ6)oam_MW$ z`XS8fNpx|)(bHQ!T7i^(iZv=&3M2ON=cpI@G0kbrDL~$=C02E|0X}*5+6AMd;vi9? zX2k}O53iDW?iv1ui-{KHqBeB~23$QHh?|U>h>rSUx5G_V@VQjhOiSHNb;oWCG`h>e z1WKGUjS6t^hKeUGX*Z{-REI#$Hy~l`D16g*@od_CW^$ib3dA&9?rar)Tzp1h&cbEm z9frS+I?^hL`qku@7W%SyCT`txJa997^+SL>_ydeNa8h0wCdlw-fE|YAIJlE3b$k)k z_(A3`qIodut_kytf*a-nmvDP_KVk(4D0>rG{A#yX)@-~N>GA$=I4HJGd;O)Pde7d| zZY&{P^A_nB8}}lqC|lh%*I5bvJ7^fr_!SJt40>NFLA1i&nFd+s+P_B@=fz+7|?ehe$FFGXZjh^tFnD#8*x~qve3`;jW$5KMeX(XE}JDP?@ z0l?-)J#e}k)zw=yvk4S<3vxQ7_g{L>SKhPZJy#@4$g{DV|K=Y+d_QH#$*|Ih+ecU? zX6uMcRs<<~8F!MX_cES6QK%NRgQUpN;bLzX`N4SF-X;>_G5C>#c}tc*&o4G%sn@Cd zJnj^kCplxeL!)b?H)} zSM8dX>6L2SrO-3l7b4PA9N%nF<6iEwxpz_FjAOn*Y<6Sqt(8`rn!+vkLMf3!IJ7$Uy*eaSc`~n2v-=wU2bYIK67{2h?(x`#03j|k;;+U z4@~NO#2A`l*xPHq`o%`W=*4tDV@4GJkx}@)_hP|uuh+zn0EFu`6Wb95W%H3MS7q?7 z$rJ&|K{u5OicAy!I0^skgw(10{@$eSYksYvEGOEb3uZl zu(rcH_FQch7T6t{4HC`Lg=1~Kk(fuo@CpV|LBBIvR<(a7<;r_DRw7vZ6j(Z(8WfJ= z*OT*a-Z_jRCjruWXTJ2u8)LSS2)sib2>Q)sLe(y8ctnUYZ{jng95P1%oLjwjngq8~BpNtjoDSXnH{q_G-mu#VrfR)V`#?1v+7zm`+MF_rze+58HX+-r&rrndYJC*-{g ziv8DYQnD}zjWln(>X;F$AFzB1$Qhs9GBY>pCLrV(Jia6LuenUZ2ECBUrdR2TR!{HA zDs*FrhJTstl?YdBWeXdOP#ru(FQISDQ9?pcRU=4>Xhr(P5nd>VIAng2zkZa@19@F1 zT;y*N;yM-6l@Cu&6?v1940yUS*Sw($d)U z6Us-Ilx@yV#;G){{riP%|HHBc4u?kCzyz;jdw1cck|ZI zne$c-^R<7@s_XNIf&^I3i+$WfTjN0*Qfg3J`tn)g;L))zhQIO&Jk_X+EJ_+fYe<#h zvi~%0Fn^tYg0B^fpzjQ1xKV> z_J`*9H>Yi2LN^o>9tKUkk@|9oDpOOZo1*hzIWD7~Ah?jZFMx)Rb4Q1ObFNqkjUZsQD@LC%sJ6)Kc+L%{z`zzi z#$wJcMm-losMbZ<_Nmu?dHB+mXc(EEwxBH`+=e6%x}y=G1ZMbNR=#H}f&g^Yp-@nb zO^4ML_4TrRWZY7vElUDfU=G#Yu0Frr!rmek!N4mUou^{p$>gav!d&S<%S~Copq6#3 z#9|M)P$UaMD1s&s=J~qS%poeup?64*+e~BK#P<+42qp5?$N0q6eu&-3r5KDwt4Wka z+i4juz?~E#ir=o^NClaN6Mk@t?1R=S)fIw7Jk0rD=S==ii%u@#lU(-3vJGz?Lkz;M9)Ui|Y4N&P7e zF^47_llPP7WYp00@q|_s4GO_wdTJ=7<#i|NsH%AVTFn6d$5R!n_8C!T%F9EU=l&0E zsc)-~!Rw(kZCtXqTU@XoV)YU9Ou?>QSWBQ6s6+JUQ-}t_prkQssR}DvwaU_o_ zkhA884%+h2wBI=-2pyV$sfQa*VE#Lxu>tL6T(_9>2~Ic%ZLmZYG|Yd7DbD`ubkT0~u7) zm_xbmM1p?_H@S-XBnVZ2w|T?xc)Q4sd9OhFoZ59kZDxt*IO~&h$ zl9nH9_rT-riA!h>tCjeH?J{ydpu+H?x)a!TNsv#e$Kkt_MrIn}T;bOuFBMsBl}-D=qtqUOX0zFnwGDZ`G)y1KnXe`wfk# zeJP6Pkm7+Yv(8d#?|zzOZT_APi;MC*yVe`eZ!yrTM&Y#D_PmUJO)y~}qf>+sKKN$% z1x4`eM8c_g?6GFTlnsyT&mG8wa7e-Awi?NB2 zFOdDNQk_6E{+V5Bg^-oJ1nwiRsq3jf#2J4OZ zQiGeb(Sj8U{iR&TwSHCDrZARFKUq*6sRhP3QDXF< z#MNb?u;B)vK@4XcLDf>1?gwgN=CP?mHDm?^&mRdwTVLooXfZG%c!?+y0DdTiCN^VE z+3LV%|M;ajajv`B=AWN@35)?F%OMHy`%K0HS;tf$&6cE)+O!4Gh)RlwrP7a@aZLH) z;E7FE6CDYp{ijGkuZv{8Aa_^PowC8l7xkl0ufsD@Ee^9a-79EGTl-T{+hV}-1mF6@HDjvZcYI(e!M3y zqpy&qa$GW|fwzKVjN}4epO+(m5BD47BC{Vx<#4TwtL6>B6nHNSQtdvSRy)|XYbDSo+vxEgLfj1vf&4~x6HrF0 zb%>&sgfAuez6`iIwAkF+I{U{Q(tP?rLv} zcD+5#?^J1&hHz_VO|1f7zRq5p7MI}4sRU?+) zPtPkVfsO2ch`x_YNiyva9p2H;oK%$AmrZc zBju8Ry}qcSI}KKrqAXg9cMuyD@TEttM@Y98t|B$8bdF7P^=7BB98Z?fcfUO%xbuDU zO==>K{ss96KrI~n#bgep8|}QmqOL#?@H*c769rd*;pqz#?%?!3W8~~s`$WW z1FmosxHTJ;7WR10>b!ye4Q3A4c}Hpf%cfw$sh5nle)NEjW_nrk#(P+QiPiq%O8c>2 z4kXWp$SX;r(u`naY&7;88C#*@1kc=v93Vm6qzd@jSvi63U?wvyH&+1F=dIGhHSE#+ zDr;3-!*>btI@<4&Q{WHeC}-|%dA_$Ee|T&&@`d7XZkN@Ea1rDuV6F`Zk9u;FW*alE+SnwgaZkB2tFk7LbU@q zJGlE!VH$x8ZY|*w_rqj2G@0?-*5NYb4`OSEj{&c&_4i+G>8$2HtS`t^q3rR@u(}@R z1rE4#6}f@mlhD_-NY2FPYKjonlkOm;7LUrD;7K;6MX)6MgE$A{2K#|cuf_8==tB!R zJycj%xm3j7@veH6R~d={&}4`ciUsI!%S_z+M-}7*{usNRUlvv>82B%TJg^P}P(m?? zHtb;6WN{Nk52+CQotxvfQBrAIEW%%Phk|((Wp50($HMysO<)mc#qY?&r-Gv~ZO4g4 zj6OT4S5O)UD;qi|JPrT&EU=mwQ*TW)cRYb#Ub%`^8C{OXB+z((6qQUUY)vX8JtOJp zN|it`FzVPUEB~2p^hYCkm+C;reU;8!mjr``AY_XM$OzDOhYGZFb){g9#iht(bCB}s zsY5_z$=>JzEhu$5!_aO~YJf=tkc;41Zw6xXZ}N(wRrrp&+{xZBkrLO=jZYDC$b!(p zpzrCRYT~ooF}g5NDMj3B5R$38hDu)R0OdU9lP(GOKwM!nwBwg6K!AhI4>E< zOA3c2JsDkG0oN225&St4DbN796a}S2j?@Mo>z-9UM>`2`=f#FB4e(Cw1UKT$f=v~q zMCc+LUWGwo1j3f4a4beH>qTs`1aI8-gvs?O24BF8Y=&nNlZv2tg+QUX$-D2>Hl+p% zC%Nt8-QT_2>;sfdL1O5tKAf&XpN0i7M)CNZF;C}Vp&=Rab~W+|DO)c{oHQWGL$KTL zO+F{q|EQ{M+8U0Kq_4n$;4`p&R~gR1us`1aPBqJ3h1n%IO3b@13H>aC7ITXkhX&Dr ziIJj&G+38dnWT@ZNg9j1nvwVey(0BEL7;#+Axp$D)RFO)`4>KE6Y3Mysi}y}qQQ7P{VLYS_j z11pi42AmBFVvNQ9Vwx)T80P_R5K(BqL^11hRJI^i8^#D6eY&mKlJk8(f=c_0h|3$q zr`xs$JHS?ZM1z8IultKx(TTRN9aC*|YcK2j5Ez5*yn#CZL8Si~gMbD+P1bpj>k6+4 zLDOolgTcrSJEfL_qYQ#Pnsi@62rFuzg@;QG#yAKv7`1*?NK` zV!Qafq<(dHWo)Z|FREqC;Q<5E9P4xjT?K1;wZs%25T!~wW=|Ko^qH0dp5C-$`?ojY z`d=CEEOKm!QRp%A;D=bA-;`%Rxod>5)e{^JD(q-TOB2x1WD z_Frr{QI=kVcP2sP>8d=$LO%AU4^~kQ_H3r+(@X0aW?romi@v|d$BitG5e)h&gu8!# zfL3yD(6pi`ijNK2JnR2)_s-3gJ^%i8Y#S5Xwl%SBPHfw@ZBHhd*tTuk#>DvT`FwHC zsk$G*{byFCSJmF#YxnBD-q)));wQtf-hCDA?>&F_ot9|ZuKa_9cZgZdRkRKuUS_r! zryHjiX*doDFai7Yrgwh@*k2~~1dLkTNdL=fEhh1*HKiKuK&L?}7%T4fO#uZ)ojxak z2ic}WYPQ|`wM5C?N@Rh4(MkVG-**sNIGnzyK#UCaZ<+PzUotDosIjK$7)u-CM?>

hid zPxiiu2N2tgRYCS;$)xElPQPC0j|;NWc)d!}(Xhu;T519TkQ-Ux?x}Yv_Lm!e<({&Q zQkZa|mz^yY?7GCGv9!mFkv$Uj8NnOBid+}9e33A&8r*y9BwDkOT;G!s?d!2=sgkm2 z37k0o7~;Wo-j@TWq~Vf!IbPA1XTzL~`4Khehp1RboJrb3;vdr6J5LbHzNmmI1p5yd zX#IzoL9RPmy0umAr+sR*CI1tTf~*E7SoIf~;}cD+&3C6#uw`0Qjt|l|AKph%=TkF_ zc`@bStwOVBas*i0XGQLouziou3#Zy2vjB4$nx!l@dY5SDemWaTr(Ng$Ts>*k(spiR z?UAV9mMu7tG_iP5dQiYGK`cR_DzR$aDOLNrV1P)n<;_hL_1P1X6GB!(qv&Z-Z;wFW z-UXK%LS81FNRyO30${_Covj9<>a@-Who*7ox+4pBl6OB`vnM(&qFC>P`Ad+EEbt>j zEFS%`n>E4k(>?St1|qgWDM#a(^jx(?cTy)ORvattJ7wLCldpjNL+Ek)~ur+wqC zG01#=B4528{LTPC2G)Ff66q{1#i3#86aP_M6Nw!u($oX0)oASc64R|m?N|rk*%a39 zaGlox&L^3K;>wlct}`#2)%tHBsh>z-eEs-?RaMG%_c3l%x1>8`Zhx$85=nncxg3{c zGf9#seI?xnRGUJ>XRYMn|B{^B5T=Op84P#k6$q&I6OyUGa&~D)W;zBpfHwX89}l!_3VZ%u71}}s)0f6in+|UUJ_X2w#_rVMa;2YTkICYk zT)B1rZfIJ4F^L*$I_qn`8ARGt0x3wwecEIhbb0O$S}2z2(xu&VgIe6g9F94l+H4-K zDGVY#t5L~p>HcK#1z8TD&Il`R8)59`{gDHRXe%W~eNI1Bw;iR$dD8~|w8?o=z`=gD z!H57e->6n(Ra;p2ImeG0NoNbttIhj0oQBLoHeYpJ-oB>WwahQIRyVnyZ1L^z1F8s) zXzc1-2v8;!unx_q<_M^j9Yy{nZJvtkULarrNmIlbR%3P`him(e1H8>nwT}_TuJHEe zdtV062sahGue#|J6|{$F0?N0JB?J>^HT^jOzg9?>lFdvO?Uw&5ZJuR&_9@~Id#;Kl$V4+yq7U25EW1)Lj~CGI^Ky8-Zwp~8-ciY zABZPvzspFc5$r;Cdq2g0&v#mR1B^{Ivs6CYnn)~c)Yoob7e1$IICSX~VJbK#KsDHS z=TpuocKb8k--XAkX_tu89XieU3k8T(*Y|!pj>e*d*RKkXa4Phh*4J&i&rak7b69@3 zbcz5z?-Ap=k`6^wjs?N52Zt^T<9>aeu%!Bx8T1l(0WgktgU;5VkI`LnaePYvqKnU8 zpyEW2tZWkzm7@gWDUHK3EjDS<;c8 znaMkDup9mTzXXt)IDf(O0c*dMh-e)uG#n2nN+5EN%p(<>(;@NwZxL7m@)Nvy1rJYK zzM|cI>xQd9wsbI=kpLMgF)@jhjOA{}BJ&1Tm#H88i0&2Nr=gHFQWO?bedOFhU|aLu zN~DEfbLhzIPUrJ|k;$NA)JXN7$Y%S(ch~SiUi2=d!ssOQQ~AP?nDMq@dEURAt*zh-xtg`2PPe&?E4@ z>+=p&J;CZhh8D+ymo**~Rs}S^>W6`392Rw}c3Uj7pzVo!hG(dG&FzNeN-V?6DRZj4 z<&OtG1ylR~z+6G3P->o=L%5NJ=c9z|glg*sl>(w0#ytlp_|#Im0=!+Th1+T0<*!9r z@82E9dA$?3!a=RGiv!5>9+<{mCvV=&5__N`hY-O`8U4qo0X>NsO^|uBDku8SOkE#4 z*aK{mRJMcg0uWsvAWBfCZAa2s3DpaUng%Gq)4w{$d|IUVpm+W+J;pKv1yugXc_Kgf zDC^CQz)O|v9sSvI)AQdjecMg~*m&`X*H4q~xOb3`J}&}!)|U&~qY*%i1;U`Et+9Fx zPO8()9(=tqzkE>ji>Gko#gQErz~MtaoXV66dY4)e2WZP#p;kM;3@DjI!%W#1dV1aw zJC(%?@@IBX#J6X?b0Fe%YQF8~Fr$3TcRQy_?p*o|BaQLebzQ9WG~Wkxd)xIj=&`j4 zZ4|5SGmtX=p(Q}&=cd%o-28noYATq>Yy1{O=w~W>JVPZ~;a_}pADOkBVU19Pj_p77 zk5xRtBLN5SAPP+VokLt=dLqHQsH%6w$W_a3)halfTrX@}|JYt1P*jKRVd((Y%bUD=gr22dD&U(f+JWDy$2!s&8TgdCzMBYqD|?;#2xnP<<|A%H?e zkpM8uXVyYQc+;ZmLZ?h0W(C%oYn)pXa9)#*9u$b(VIDC`tfB>38Mxr=dm= z2l#Qgg$D27Im!F6)VUwQC@x!2*ABoCSIZJKlmaRMhM_)=AB`MB0|m)wHJk!MYyziX zHq;gH8E42aSAz7PEeD}_Wh5C#~y&&>QMKe^utM8!piI)86sSz@pl_UmMn z5I*Se-l>Wa$voTQLnc~-2Hm7x5!y+7v4S)OA#w?_GqsXA85tf-1v3N=rycdjv(RaY z+JS-*k`a`;#?O}%7aZfRch9wz9r^7!tao%jZTKm`X4&p)g0?w{3MQO_eVIXt)Tk08 z7@oPskFJK1^N^|Y$7v5lHiK8W@AoUPj_l}q^IkN@5$KC}&Q4rJyD#OVv}!(g>~>(a#r`P+hqz`c}9O_ zw)d9?__l?IQq%1c{=TyZYtTEeLiXCNDnf3$3Nlufao!RkR$T*p#a`y@fAK0>L6|H6 zul5xyMl7Hbjs>;Aike?8^pVi>k%L5GKJa5dGoD9r)WXq-sf+|cse%&vCyVEdM=&#t)}W)Vty?Qu57hR%PU*ZaJvNzme{QTvb3!7mOyuU5VQ` zdTv+=oN|0-;d``(h1l+7gY0i*R@d)T=O!(|W-Mv;pL2$Yrts(LU>wy+armU&`{FP} zASubFpHeCiqGFY;BU^nl;3XyGRP*a#jo9R)94%l+c#L9jMj4hlrE@gq&oBN4e(E(vV)vQb@*`w1J%^Tj`z$GbPV|IB+02NriLY77uS~>d z;cs@;5N(>qKu{qNq(urcJcm&j8X~>WqiK19na&ETS%q`GsN*467q3^P%E?3u0@WMA zm>h6+-{SgKy1;jeLqW^cktB}h+(z9(ZUmFoqETAwtV_PoGhj#7n46#)%UT`*N?i)E zwQ@>wxi0oNrsqwzWE=byKS(<`Kvd(1Y#SxFD!7h_&Kk`!K{Sb>0bi*Xy2-Huogqem z)j)j6fR6<4RHmu~*d-;55zqUcfD#;0I2prfRiGWK>?D!qsB|ouYMIVIthlYex3pcW z9+>!t;S~#5qa4ZUdE`gBW3j={PkjJbUl}>@`BLRY9CvYB;eLdgcI?PaszN;(oAa9NR7vk)Z6SKwuj8`V4{su znZQzFUdO(vxa)It$z7xUyHG^?Fd|^WUaFDM9=+D*udLZ-Jtmt1U!WRcJIC1X{>CFF zw7@21Tn;MX7{e(HnAy?N(BhQ)Tzu3B2Xxao5iWpV1P+7D~OE8oCe`@F?K6U0QtMdFUGnx80PYv ztA)(APgOaMm2y5c^{hL>jJ>2*vgWW<7!>VpKv@>~8+X1tF)=luM5wngeymSHUqog| zvHrQ-U%3b);U{hwIF!jwMcB4Sa3^Y*u(`ib=zZgAD$mvOtFDBsoIW*p9&O;6D_2>Z z{hW@8v_#p~;g-IT4IGo#qntOB#Z@$FjWj%KKECwhM-i%((IFD^BRRSehv~=(T&}c1 zxQLs<96WtkRZ;n+!hNP#hVNWpSrL2Kym}}8gGQ? z>=BJK?ub8D=QhYuBS=LS3iOc>7%Y=@BpiZFa<$`osl1c@{=kq<{pj+6 z&wDXSa6YwWh`#8G9yk~YR2oD4g50MR7%~ZfXc9zJXU-^5v-@slwun_%te?R1s}hXs zU-y3zbKox2iP7pf+O2%brRB~T6|=Lg4xaos1k#gSw9kvzGnF=7s8Xz6)u>&A$a;-a ze2fENAxo)<5*TWZbdq+t1+>Iabebeip-CPGjX9-S=o-SNCoJLpomED5CLTBM$=6+7 zr)`GVG%6ou{SfK$iv_d-VYQRFKlBVU-N%QNW_v`g~-YuPz-}#!37a_eaq#t zRaFrQc5N%A=4ze~5hO?*e})l^jm7-&85~F1aPIRTD9a2QRY+6tT7mU;Dfc2vm^uNa z2~d!CaX+3VYINhTPGJDm=SEuu1oTs65A?YIGG!L)$IDm|o#-Iu}JAF}Lfa1DhXu;pdH}u#J0X zQfSd-&9M?jTs-{mv0F@3pVv#)2GArNt-=;lZ7?-ZbOvopxx|nne#U5bYnktKLf(2F zR$0Hp!)Rcq$N6?)qK|;rZw$}A9&FmGFd@pI$8e&R;0j}|pa+gHwNi|13x9L{9bU)_ zP-0XKR}X0qVBgrxGD0FaR{WYR%zHW#e(Uve1l7?1XZmTUb&Wu$A$G-|v&jCGv70YM zETg)i2&e#9%?P1rM3zw_jM5g0Qw>~YZQiR1xM;JB0{1o*7lB>N0$z?nPd9ZF)E$5Fs$c<@#V zr~QHt6+^P!Qt*!3{ViW8e?QBCP$h)cUiOJ%#SNm+Moie_^$eDGxi>*{fgvCstBr;u z6`5bGeAav?jO+!E!QrXv*UslJm^OAqZi|T?EGZM&fveL8j!R5gV>H{95)%e=F4Nqy)~Xa_ml}4pg>Zu= z%L9>apu*8986;Qw1(cl9)nxc{p5V)Y;dmB^bG>$AwCra~1fO+p$2EfroMabd_eZEH zjL)vweEEQV3aV<>W0Tr#Ye#L0wC`f!>=8nh<`?7wZNha7@0nmY;@)*-8de=lX5O;j zUbT5@-sFzY5Pw?*x6Ab$S-bK<;U+q87FdR+$*n1?-~37@zAn8znWroao2ES?+8@GZ zBV2kTkMn;rU%gCp{S*s^s0Zic;=avSH6oagA5BLQls@}%gh(dVX{_Jvg_{R`5WKi( zZ1N#2@PqAyD-$D#{kAiiqb8KiO`6OcFB>ITYd^d#s#MgXJpvEQCzZuX?ebe zxQ$phxc^J@!9KX*g^0dnI~{VLKLlh*pL0IgZI^b;5{V{c?byhdPb!{-;tFu8 zmrTv4E24R@P#&uxL|966wEIZL$M)|yiiOD2?jXyPp@`~UCS@FzXPWj@M}u%phqJ`NI^X#|7Z56%3gkO>dAsV zLevR~MoK>R2i) zRfIT%aJhG6iKaueZwhMS$^B+%F;B)JWKd-a1q8fOI`c<#c)ohR{|t*3fIR&b!B`zd zu(iq9&0w7)mN>#tk6aBSCGRs zizy%1G(%R!fqvr#(O?AHl4B&Snnfv^K%wD*)U01GVz4{c_)^f2Xy6IBV!hQmv;fsM zF=bdkJ#nX4k%=waf6pMYrv@oUO8*yw1MU|I;LU{^ zHAw&E)L0-t|2DPs*7zTGjRm3zz}`rMfg%4Zfm$L4&{S!^U+KTty9X)!FAAr`pdI*+ zVGZEdmVb#k4ngXFu{z)y8i2@))*2A~mwPjUDUkr0EgQ=CD#- z_{024^%vH|*h@(%{Wk*J!4Ojk$0vX401DRW4F5zvVKt+P937yC zIUAqr*Z$ongvcOQfjx-&M7@s2+5p-}M5s~?C<9O}tfc*|flNu_C}J=>+^erPI*h<0 zK259kF6H+FAc$Ya#fwP+hHXhV8+M~0!1R6EwYp0PIy$O?`>8iapB||DsH5cHpXdk- zZ1F|ECIg5wX`R_pS{Pymgj}mLz`nO6@3$y{`9K?{{8AiVEAWCgJX)v&Zk-1(ad)Jt z?g1nU3rrbBSTB029z)4ie}89p0UPoqD#wD(lJb}m6M|CGQAk%~HM7LS%7Am1AX6nv zaEb#G$i&i8i5ss!n1AVc>zy(ZO@QRxu1~3d^#NmP9>L2qvd6ZZa*w`JI>($U%KgP( zFwW?)8KE3A+~>M^;DAk&w)rH1av0~0zcQBLUqH7f09E&ZcZ8oC6zAsnuj&AZ%)0m&B75W24(9irdT)jOAaUbj5$u|1Ih zL;*Bz%=NC-hM5f*&n?N8I+h*Agi&$w#5uz(sR@nv-UgAeb&UYanU9wdtBAx#V+kqR{e~oSLMlBE2)ER9)zr{|> zZPKqww?KjF!@}1ael;107i4vj>F6! zxs5%If?Ima?fcXYA>hkC@p&LB#0lIhZ3KiZ103n3SUeQVMGg)di}Sf~| zko?y;r)u&YDICdD8(q5O8n1d%AYR4mq?+9O(k?s<{TH*Pc7`L%UL+?FfRl%qE9it# z!nzySTu;#^n-K2;mPq8Y#bIc_V_Ngn^GiL7OE6-}lqWdOVrQq#=giI?B+ua`w|ORN z*@Zlx#JiA3;25kJzgdLT1Vm1!P4iSV`>h_s;8LDo3n)B#RN;+KDEkz!?D9xu`Rh%o zmXls>5X<2ceKvjPzF~mEu%v^N1ji)@WGxfc+e{-^o2$)>W3d$U)J+qKX|D5^OGb99 z1{KMv4omxeoOvGUarYp<7KYnJ|59Ify!J73OjS;cM7(drl}JCq%!aDeC{Ms;e2#2y zN+fP?7J2H=(Nxym=zdndKyGfhDvm8S{CNKxa}8>pOnj$#$TI8K)6udo4@kMr0pxD$ z`#7bykj~a zaYZYEf(B|TinI$x;+Za|C^-10pb)qVgpLfxQb;KT&LV{ZJ}9W5prR5DHt6pbUKmI$ z1e`E&b#V3a$;PHUKabi}=H}`a>hrO_E$0%VUj3=7`*F7TOWho;OG5!=XI5}Uc1&$n zw(#lIXKS}JMPF@5N|g9Hy%yo+{%gZcz_^wNjEqj&!#j>vYDM5SU`Ko2L#*=at+Sw- z|2txH-ZI^zP9ec^HYd~TNs(xyZ2$70mmPt3u)E7x>2|W_^se#FgmtLh7$x*^uC zB(f@a-WgwK`T+T8VCMy}%LhZ3gGe&l_PupF>@Hd4#X8<%EA)9Q5)^e5S%`Gy69?a~6m^-Wi1aMW zVv(+GoF4pLLi3|)@DziQs|~S6-?_xE@8)KV0a=s#&%Q&{N584)AX`h!NtMhA@n7 z)bvLQ>vEK}R#7G&s56Y{ig0)z#&wU)oVJ6V_G&@%8t%=<`}WgBnGNb+>INEN)(003 zQJ2Y1#OuuvrhH*>wQc*=JGjbtouMj%s7`gRW?}r=NT1hA-bA!mWc!#LsYh-|qQMBz zOzF?U=7K$2yNT|PD|T}48aedCA)A*uo@3(84J{k-%py@ouVuVoS^*ZusE$GFLAgOx zuxZM8x^J9q4@Z9t8RwYdowJmCv)iPU*dlOcTw7;$E_`qgg!zB=QG`8xiSh>#)v#Iu zHRwFn^Q^CZpgOTZA)PcoGX|%2Sn-^)zLhMODve!xfu#^(;_PJf`wSgc zi#x>O83287rN9rE><*k1$(O>)27Rr*5w>%3>;4cpM-jwJ=SNWDZ{sF4s0l{6xNr@s zGF~3p&SIhn-GOCd?Qkx*yqFqIX5IjQ-`e%L0T-^@xZqsQXPQVK+U-jWt20fhc+nsZ z${;@|iep;pJ;qZ9V66Get`CQG?61H!@F=5#Co>^7@ZGFKNe{{+amDZS4h0-zbn7%U z-4C)@u^Pv0L6@^}^nK7jL}so#%P^ILcOo9Trvqvil$TK+!qjPR&#Te-f0* z{SqXVZkA+BpaKgP--avb^&JYqGAJn(7j!{;w?{C+`$BaS28S)^b)7q%;M;VlDqw=| zU_wu3Bsp{h?OWvXG_w>X+eZy@CxbrhY-vNr;U!--21{c+xgS4GTz8#W`e8GZ{vl@8 zX)PCV?Q=x)Fv`m-J-u(ImHoR|=gsxaELuF;`ImvY5e;AA;Km0aXRcXREXB1f{Dkb;89a?Z_7;G8Wt%E_I)WAKX^xv$ zr^l#jj7F$P!0#pDs1O|ZkLd2)TPLFRS}kkWmPcw2>)&6i$i2;G;hxH%*j%+5(fqF_ zg}qN^hK3+CaagMH#CRUO4gS_?@TE-qc1bv_kI`9lc)oBn3ws3az&>&Ht?;6dL4bo} zQp${kMedV$HMY@`VA_>!R}uW89p9N}gF7CW76`nLf3S~-X{WX4qWo%jhNv&uVqtg? zLag-?&z^j?Bl|wf8S!kFGx#J_yZ&-?3Cmqg!uBc=C zMZ*=)FKB;8g+_40aIXJE39LK(UKl1D5n?||OzV-~_A*vCfno&dy1sCK7 zVxFDGAJZaP?>o2zLtd9BLq(W@eb9*^xI15rJqF+2U7SL@8a^^kKcT3Kn zTw#5JQ1FH9?1JKEya5^VkrFmQ^U6f5H|{Ux7`*wm#;8#%hffg4o&Jn^peGW0wYB<` zD#bxrwYVhh!rAm*!_olDyW8)NFMkefE@RHAl+~J zGLn|MrgKe?ctmqVeD9NH#F!V-HSR=g`~%2rs*3qBGdhe?J$MVknJpTO9KNiUu0k+c zsKHETM(inzUf7q^nk|uCnErAc9FqVTh_XxY9`|Hyj#%mU35` zFzSVr0rxFV?6x(@W93ht7pky`68U7zPx6C;II3Mj%p)9*#++5jek52UJusrUkVNqc zso28k{99Owsm$<;n?fsrxK`I0Jw}7QC267+KG8I)#-C7T=j?5jr?$Er{Di>}sR$X> zV%oX09%2H3FBfY|a>cyfizluZvV86PwMNX#CzVbs@R`&DbOWZc{B~z&#-@7-!|`HJ z14&?hS>;#0`!j z&*Ng@0fQNr2Y$rYLv(p0@~dY0VBLOsF>f3&(x5rQperZNBd&wx=gfv z*U>eKek7$!=`3+W*0=;DOD_;V&REq0IwG)>y3G3AKA{OFXjdlNgc@N|Kz{7uq?UrK z06NaJu}#_o`E8J|agK$!H8ZKC)cnE&dDHJt+;;0FT`{T##<>#wmZ_bv-Yb?hPD>rI zS|0Z?doQ8%rFl6{FnC!wDk#~#*>4@rGzl7Vji0>pEIwG ziDvLshAYE!mlu8fkxpaQgr~aDbTNW=rqXih!oz#*G$Ea^@R%$z3tn<^eMB68dP!|p z$!6PDdci#%+o1X#gcL7L$0oI=E4z_((@6YIMMR(c5MSAw7QH_Z`e>jAPT2Eg9PyR_ zRjO6hi-s2Qz3V1&F!m%6?P4MUEDDT9y@ynpr5CX@D1Y>Of6h8F&zBmbggkzWHeZM9k*wRuJg1gQS;w9v-WaqmgbU{1~uM{Gme@?`cVwHalIbS=e74$SMbm71U9>5se#}->)!F#mjNymmCRh|?7)Mp zBj8aZG!yexfr*R`J1V!mB0!~UXQ?q7#cA4kFg|tOdluor5unqkT6g#$7Af$&LAPHk zb1|FBKltQtWm^#2X=*LV_BJ8c-S^R8=*vh`qBDERWfYZxoT|+Haf6vI%Y0MFi0vI?m)ol-b=VmYSl{6lZXv z-EKe-rwGRkqs^Y=M5+n_&OX6h3rQ^7evHl;Wi_3JC67GpZ|hfMYGf)ke!ieqYT`fz zxBc)}NvbcT)UAwje60Z=S5cI^MM9{##1%7=Mi&y8@N^irjvH*rLmi|Zj}}9^1(*s1RpOYWn_}? z)=X!mlWIW;VyvEJg(@eGpvPG2_R>Qg(E`7B!+yogl+|LpS|-U17`$OiiS-r8=sWY% z7^xx5O6EpTD~NJ)vV)cBvY5ghP{Q?cCS1n#VY*#XyKGuwUDe%UI*R1d5(`n=VY(WB zr+ciGj=YrL9bO!$+G>dag`heNvumvb)?R3UFh5$kk;fnHP-*2Oi|ZbBtyVd(?9-uR zQ;ocYKV>U^7#!TFLCYBycq#B^3R?UoHx_Qip!hT5DSRD-K|bI^ zGm4 z5_lS}^{K0pNm*WIq$;#%A3pzbEy*5@bcreHkh2iU!2I#;g3Bg5LMpw4Do1q~&FI6b zWAvacX0m^jpfkn3m~4mmh5?4EL0S86VyyG$JnShFmKVDjbmZnzg3f#ebl}r?k`^j5 zr~HTg=G9;2z2pYlY{ztbNxpWOvgxzUoN5)+;);6UTjuFSL~wq%yx*VnBQiaRl(;Xj zbd`2DFlJAxK&#RZAZqA!!tQ+h3z_&x ziH4MiXB!#r`jY~#cZE`0FjZyvcd+Q6U!6J>-+dS*FvtnLmnH3Yf9)>PD2ySy!5YR3 zH~t9HCbFeJ%VUPg18$wf*80k_Ux1Oz|Gw9!yoQ(FS_?D%J{u!%Km2n(;1^GmgOYH@ zs9gwAXH5g6M$u^?#Ho5Zd@AvXamX9tE@FNk^DNwrp#O9|Jwxf|t{uM^X$Nk}>-5Zz zrL9c&ID-WX7nWi3fYziGJAo)g*k{9GE#LDJ41x8+h;iz5kDi&Y4T4Uhx|Hc)@KU{I z2j&~ryjva6gYsE&gLSB7&=9}Z*f&^Y*njdJU%Ur0{zd-=c(mCPZd7kGvBWtl`1*)rnHK@pO3y7=hXXbWf z1VYCcMbqfnTILHzP|^MvZUX-2uGOO$W|M)v4~x&Y?0lk8-?3IBJ9$$n^kUB6Z5de_ zpG+;!F_P-DZR$_r!&+PeMb?|&8@=Q#U*_{Jb+$O$*V6Dwvm zp~P4o`78{FHhoehGF{rvkiTw#q_6xgR1f)rIVF0l=ipLuzx{EbR%Wj0qT^2XEu|+3 z^HC?b+A>V#o8O=gA5K@c`d0Af;tfe?oRs^h*A1#!<7%?Yua_q*{$kxA0wx(+PuK?{DrD;r$Y4tWi!NvR-s|!0xthA0st7=a$ zYF>BwaNj72)QOC3CB~0ICHT!WXsZ?!**~dkCtFgX{hlRhN1XSjk7T6)Kb;wd0-@&* z?)G40_Ec`OAYLGl&Wf-$4I9^l$7Gdb77KFH2eU3C&+3B8pJ|sH2V8gGhQ?bWrFqk{ zw!D@(EZnC}k)e{KY5brB%q!%N=}m%kZk*pLBwLOy{R}eZHLJ6`vgzsR?s4{}=rZyk zNd$efjOinHt+YC>ZQ_&R)~h2g!-h<&xP{VewRt&sFumwfSnj6_8Jz} z9HiWxuAIE+eH_+Qb=`Vd|4YUpJ?ogz(PTF`)QjiA?=|9PxBWv(%{}SvuMT~!UrRsL znY|0`E(Ec_(-1!d(z|w90wh7?j(Zsc6&DumI3M6!=c|@b08f*Z1K=$FXfj?;P_0te?DBP}BmIpZfPE;1BzmRoOz`P_~*|UE{iETD)zAQ6dQ;t`L*9=xy;lvcN zVjp1RAg2zBCqLUKOb8_e75_qT7t-)XYX>6M#v$7FI#dq~FT#tZG9GdsoTj*P+<@m; zsdcsXxq;=eOFNPu)B~1(&>^&f(QF=l)DadOeS<_8sd)wP4*Q%Q!0goUK4SF<+ipgc z&NR9Jc*J0)8{~5zMHxNeFmZT@2L%JYQo#Gv$Qz3PueZUpRQ+9R86>l)188Dnsu?X!|JMWlX^$i{Ipj0wEg zFal{v6?{r|H8t3ItJlceh;h&xTwHX?ZeYSNF|K-|fbPP%cX4IQ->JNnnl`Miw7%l3 zD=IE<##rFVQG$^x;TGXE6dfa6Hg|L)14UO7>bX+`tP#wcGg15e8?={M4YU~dqo^Tk z5~XUBxMnv*)cJ{6`cm1{FBC2pqIqx^XX>^=qi09%9tNrD46v8J}73h+=0Yqf8JED%h+P zqqlIUI5+;D*jYQfZPYS7MFNv%H?FQUUD zR*th6-5ToIpc+va0l@N?vIVVJAZ5y{h}H}#!Geka%;DNj#)%UXBxrbO6UqhxB8B22 zw>jcL-v>^ZMk+>q0&i@DfZ%TOri;0g{E^?6oE~Hi<_OyU!$=;JJK4$B_SBeq6LLo_K$Qu|poAnhm57~-&#TUoLPKvQQ+2TiUUxYS=>sr_m1(p{b=oy1ubZd}EjTXoRLHGj2p+0B8R+ z^rO;)Y4yq#S5pEXDtS{imiqJCMfwOeCnOj7r;8 z1D7<;FP4tXib~nV3xb=9?k_Z*8|IT-SPLK^Qddb)A(h;$k9V2_R5|)c$a33vHqI~b zA*W$_$MgB9Kr^F6q;erJ3EOg^o2bgOo4KdHU+Nm?OBAgI)VUj zi;WU+iT&(iZ#OP90HdkU4t4Sa4p^&fWg4H7E$ly?R4)AYX2SLntpD^5phIf%hy>5k z244k9c$y&eJbCMkvo0&;9$~9#mrSwtc^NoH+ONu`t)^LRczxBi*o<&^>Z}v4al*lpMIaVw_a9} zgCoDYoqp@85^J+-B-{Vy6>qYu4F+jVl}Zv|$PWQA7c-fjVtuF=2meUG^ZPMPtTfp} z17ilAeBB84emXz?h-JpW2kul`f%D=O)mxab$)kY@0}g+Lx$1Z#EX7%8Q%{-REJ#0z zmh%1cm1JKVB2b&-5CUAU$Hot4uNC}VZ%F3s$Eyov&+qg#?#NL*;5m+iSWVS5%5B_q zKB|W+8Me>OI?ppHNW7zr2cb&S?&kNQDB{}yHcmUOlYI`4#QWEF8$9k?dyj6|8?sb+ z-bI&nPQ3A6j}Vsey-WPLAo`8sy)7LyIygh?eL^N31pVIjZgbNT-9 zEyQY#N@0UYJ+4`_M9^&odIhGLyL1KbVff zCv>&_aTa~I`DjO0nmQs(fsoTn32?V${ZF%6E^CUs!HuEFI+{m zQ-6pl+^brBXVvIDJUsa!ggx2e<;qM(#K0CTq9#b@HO36)7$Aw_vL;ny~% zUN@%W6STcWeCi2PYR_&v5FxUD`sg7+fjF()3r~yZHS2G%D7tW>x&N^^Sy_O$ z!p^Is#q&(wI8*6h-r-81<3js1@x7_SOxaee$DC1KUaH{Bgs3Y1sx25fX?a!a7%U8q z_3JPykl$A7(zoTy7do}tuCq?@z?*Ot>%|9$`39Vb3v&S+0&>`_|FcpTyeU6*c$ulr zO}*H=`ffcA`n#&?i*Zhi>eE%-4udD)Jm!dJfn`IeCVcOfaO8lIT-|JtV8om=eO-XN z(A9-C9=~c?ug&L@{HL38I!;l|r;3bTqSn6xqBI76B6lQm1y5Uauf`nuee{4kR7dX>SQ{-qxSn&nqeCf2 zDLX})OgbTGaIVfgd2QrX@7mAgD|Q->7pevRkqzO`M={{yjmIwTn*-W>eJqu4@vtvX zCoO9oJQ}~%$v8?Zn^HBA+p(gt9QL|;r{MlH$(zO;7}~=zxs6PK z4#Ri*G0%FJ5xG0ngr&H*Bds}Q{I@cH1Rj1?y$pGSCYVibDcKQAFP@O*k0v*WH-0m7 zaJ5CB!iU`J?-b;3VU@jpHn9AoHi@q^81FCt^+E16Bb{U#f#F+m zm9v~&Eku6D!nvfjiT2kU7=8*HL1O3^yytU*)JzRR-?2s*{$HTGA%jwMyVAZbj}x9N z-XNF2KN;fXKc@z+t&!=GIyJXjR=DGD>NR%Qx)N4@gu{XlzNe#Q4k@tiE`&v#pniSN z+}bHfBiw;NkQ-EL1m_=5epvWOPpxeSWGEqXb81>(gYeyzWUZio;6Wpr%%qyE|D!3ij%=PCKK~*ZJD6?h+qFp)1D7O zhhO9`=)FpzkiX0y)Bl&v$ys{Xo9-o|Ln~#w!x^UKS5f5>iNIyrj^KXe=_VrYAdT%JsJ;URO zf!aF^{*aLX45`Hoz+$uo#H=LW_YOMjzQ`nZO)UgxqhDy4Z48a7Gu_{N^r0gpDTGaK*8orHGo6~&>`23rcX%Be;7l9h^v(x*;Cq;IvcP#SA;DL*8C z<$I}1MxRZfT#fk>6(V4=KtU`xrmH^T znMLfU@8=7b)NS0^490OuM<~k}LxJVc{mS~sI9zG<<-jfP6(Oh~1e4Yy-=eFrr&fmS zEHd~IU|^&=qGv0yYUH2VHBNMX8x79-54E_xAVtvpg)#nk*6qdvOsHVFy=TE}Huuop zhwMyJTCd32b3tI1RJ$uibel-W+`+?Os0PP8ca)-1fZ0B3*J5h>jZx0)_q^L1qa9Kf zs$VC1pLrO02=LIHyZe)c{8-2gl8n@t?9XqCe2!XZ*Kd&R7j)Cog2@f-2Ksh5L6g~* zUWd5aS*Nk}n?4M|xl@O2Q_&^;A@KO< zE+OGbVb-Z}e!dE>FgJpN?9C2btBi)7>GcQV#GQz2egX>Ko0-CRM@1Jk&u6D5z*ZES zFk7-Ci9PM)21{_|GHrMR zy51{DH)hLOa~Oh{TB{S>DTx8Y$6-m_L;)9KhB*F*?^^rW8Qz!VZ`pF$@57{=*n_f$OZ`7XJ%PKw5GxoV|_i`UP(VV0_vQIA{3 z%qXhy0n@iiYy;I}^dB0hzs~0uar<@Osd#uK{Aef?W^ww8g!{tNFx&IOKDDEdN3+l6 z)7ay_wS?gJ`Aghbwe~Y*-JO_lQhW(AHZ#6`G=|ILqZ=K!`aq~yYY&&({!%{fl$)pN zv3O^odh%;@qkNa`fLR{PlH!B?p^oyfa$z$IpF#ab>?~lck!hH(dl!6%f>Q_h^<+VQ zwU%n1RfRRjx;2-$7Qsv0s#+fK-FDl_9ptCpFIrmRxs<3f7hWG+_DSXTNcH7&oTCq2YAHb?CXM3$6-SD1PciN+o2`9%O_JPA zs9A3YemmK&|5z_u3h@{c+9B`Qnh(Fujh*zSL9a%Y*Nlg0eMU@58%#AWt&WvxHDI=D zHhTL?>YD_N2noEvw$SAoA>>%95tk$aL+r}j0$mu)J%!=V5}S#$sR$^TZ^SyM9R%~3 zmnc7zu3pGnK;C*}+@0yvS+jdlFuhcgsN3%Do4nTdFi01jCbY-Px+Cm2xlHNqJY=2X z1R3m)6L`bK9ckC_aiZy&HaO||qhj=a?cwPA zw>X~lc;2r#w20J6GK&2u5gYN7LCu#HyUFvj(;l%3Eh(x3ZbBIYYKb;mwIELapj`7%bi%pTHAt)O<#%g{pnNynSf zNI$(Xht!fz%uI7(FQt*JBDx7z^kEO)C;KXVC}_`gm5m6llV{4={SYlQUwAdZY^Pte zrDr*VeL=hG2!5N+bw?HwG+q`SaHxz2;_c<|zP$fp-7a`5YTMmab#*}jVe>MDbWLa6 zXl>M5PZ@VG-77;~T=JcP?Cse25E94G>wX`>^weHuBZJih(69HQ6KxRogfd<*de+LD zsg}m2VeIvyvt3|!Y+&mxO16*kATh7=Abi6jr<UVxp(}yr?Vsh|v$g+#rj&p#;Vj71lzfGRB9?_j__3 ztV2eJeM`SUQV$h;#?r}Zgye8G%PoOIo5^~TL__pUakyp~O99rRBdw)X@zyAb>|I>1hi+mu`bv^0UzErcp>`%GJz~obB)X~w~uZqG2vFmWj`^6#z%GdGm* zR_?(;Y%HG+_I~jdi+*8lWYC!^S9)Xm4LtG!|LOxw=@C?vYS}92$YdCd2y(s-e&PM( z0i(W2r>%fTP5wuZ#7T)0d4f{y#03ASBd0|I+M-D?Xov}kv7KMGOE!zMuzEE!WO0Bg zb4UHN)5p;z8$&^t$5s*~G-sxu_X?iES%<+io!9)gYva;^d3vm9C)HtXY#2EP?a`$P zi1BF_b6%3Tn)=*&P()W^R_yGx z%AM$r#24=W>)w*Y%umEJosj-JOl~J_{bI-owmk=Z*=24TqQMLrqf=T(2ZkoqupXO! zV(R%QLQD}}OUao&6lcH6S^4hLD5d9;((2t)&A4ph2?f&tfJVMoiWft2zy|KcS!R=| zqg(#dL#5QGr2zd*^VyJ>PNT2U!j6y+1P8*~q4r~o?^BiAr_+x5Qe8fqwEm`4Z4xVo ze%}my7`LN?l#N6xp2r&#<6a9LwuqaAmHM{cdgnAt`b*zCR?1E{!4?NI^{u>4ejlmk zwGpoA2gLfl4w84H)o&Yj*_*{NB=}EaTpFLHOF12A+zL@X%@3iaXNwrLbEFK)I!bAC zwk7GntA}+m^1N~Yuv(h7O)&hj@)&h~wMgkkOTQf);;=^}OmjfE`%Wr)a0z!MciN;) z|8CkxV7?R)7w+D^^rSd+xx}o-!V+M#i~#g55mK;QuT8itChn_XKXdjWZ!S)s{Z3)m z(Y@Qm?rb22NUHUjc})HJeU)*zD1Vl(vPiW^ZFRtRZ_$3({y8vhQ*-Vbuts)~rZ)1B zm+UFA33I|xa+sXdk&5(D?epzt(@bCe*A%w}BesSR00r?Cj?=S+ue|iG?9$d+&BhR+}O;USjPE>U(G7?;F@>=r4<3%N=0`1ZBVv(hG+Q|aodeng1NwCQL{R{ zUqJ9Fpf1w|d@gD6)iH}wYy@XPAKW8%>#6nh(s{4=Pt{P3CvgMsc2*UxNixK;@{#ba z761Bk&-%&7EEJ3bdTUD&f&`=y51vTnu9mHDGB!c-N1K63beZ1U7Pv?4#_EmP-Ak&f6;g>j5thzywHorNG+8y%%x?%` z0wJPcoaE9b+}CZrTiZg9qI}vzb-?FdCg)2ymILi}F}^01i{T)bjf5+UBS*RgvM)!S zl4s#-F>Do$Kon+DbkwUCOQ)LOyjg4Ac(6ui87U+f9&IKlPEvp0mLST&pQMT= zS#Mo;x1z;M$takMTaMt0K^B5+QqY@3wH3{mDdnp9C)I-lF`NGYpMB!u0H{`S6TUJxM{c=NJ+FK}0u{nJHRFkIkHr_$zfR~c&=7iP^z%uMl1*Py2A8aR6b9m} z-ZcW2ZVjnE6caS0=QOgm1KDVHRjG9E?(kZ~xJa9?b-3MPv3im4)2=)Q-wx(!5bemL zH~jvcDfz*!r%Wy?Yo{Po?NAYh`cMVOQ}%3)_2+N%X*_lE~A2{oYF1uCS(`P&CFkNW>(@ zc@`H`$I_Gj+Icr&$NrrxHF^nr^Z^jyR*DUO#45f=UV`QyfCCyqVDVcor@6 zmShAe+YT=)oP>ghRj^&Jx`i9GM)v0e2nhP3%4!v&sOl)t`~xu^gkdBSN-ZEme^V1W zWhkpHKE>+!+U}#`IETX(q}POH=Pml4{#R2gv{r74r#@Tu5vyu8p` z*Oj*o@e9HT0tCzM$U{T}XiaPSe~xZXV{0R7sOaA8kKU|o$#C2C=Qe7SOn^?3t6mSs zWji}4$+A<*T9%-V@qLU^aEfK zRGlT^Q>(LWtmK8i=%ko1O-%sVy;V8vuCW)<9I-A(CZyISMoB|?bV*~UBLg3B2KHn4 zbwCZ^$QE997k4naecbTYQ0CGN{y+@jySmo##Ryv0Pk^p=xv-f9wTsasSD2DFKBfX5 zFyMi>HwJ&uitR5F2d()xdr#~1ZR0uA|DhmKKn*TtFIMv^Va<*QeL&^Pd5_pbm7;Ln zlO5txBPK`K4MF+~l4{7&C1VKSGf?jOY0m^R-z{;WwcyMG?>Eid{91wk00#v4j2(c! z=~uuLoHd)qTm^k@rskpbwu%zr(DuJoq5m{XNCR0GuD0(x#H)#yWBDY{E=XTlh$5(; zIBMmX1&i^DDr@V%>ba$)6?aJ*8NJl*Dm!_X7pgUx;#ZgJ*QVOS2d_Bqpbk zezd4WUKQ%)QM0ALZF+tjzbF%MKLJJhkJX^{3IOi^3?s^N;9vpv;!AeZzJz;mTuyWk z=+{L8ub4_cP95OhH(>K7!!>`&LhxVb1-JeR!_ecXB^DK^UbOilSkf`}BazYJKJhx= z%Nl(6*rsQEZx}{|1EcqAMctZMG)w%A^lp@WMUJW4_1u(8Fzam$2z{>nOz>=AD%Sa| zox}i-g>`BWS?HiiH~XG@pLB4VbJeK2_zR}dxKGdICF ze>Q6Ns@Rqp_P=CsK>{d7I!QI3PE*O<4p+riStG!|z=@^2r(@r=<*LT=)VuxL?xhk* zbN7i^c-oD}{WTB5;+`z`%tt>s$$T9nt57GWkiXY$Nl8}4@8d8pTK=)U%xXLG14v!X z^(_=gX0vaE`+xe9f(L;5S#sbvK?tHEWI^blFbC9goEBcspLJ&W9kG26ET7)aGjz;DSNz;Er-T-d zl_RXM9&{GZSU&p3g==V>Q4NR1{ZkbLNI-=MZ}HtLWnY|C`I)qtT&?PQg;@T6c|m3T zp?-i(1QNfuMN%g-tj#^cOc0Kdi+fT;-5}v^)yyu18}9YLtSgJjl$Er1;CGPWv^mrK zeoiBirnOwhrxn3$>Q>VNAv~h&1##S(u3y`GakuAMU8me@QF8OnMJ)Ryt#Be8!yS=l zoFbyV7Iij#8VA9$tKgU|5x(_UqPzDKj01EtFtdNVp)87-lmI4Cw`9+0b&<3mHGrDe z$JM*5VjM?WR?g@@i?CcGf@N=mZ4W2q^)HSY-cpDLYacBV06FDdcg{?Z|bnR+WOg`FP;_KhQoH| z*JpwQrz7&o-t1>o?jRn?eMMUM7`R~9DT>w1Gbfbs*7dh#%LAAL_e7i5PV<*P zI~v(yu!(KZ#gXc?|GMTrZm+f2oLOuUW@Y^Xf@&J$iKb-w?vJkG*v+{5T`Wvr-|APN z`mM=H9&ovk7!e(vl>{DWe+;x#J`;JgKDs{oKY`|aJUnDQr#WQHN+7XN`uIavx`Tb1N zryZ_k!-4SzDb1>b8rYJ5oT!xpAT}vN!>V$IhbV@(j(sQMK5H%JsjhpA{`gZ|q4RetA4&Upu(Ex8JV*t*!usLI_iAVVE*$k;`LJ<*7|cUhYojm zwaUNP(u+iI40zm%%9V$=&TV_`2%FWbf_~Lro(Na;28coO_>VHIgt!Ju9!w$cvV_?~@c&fC z2}f5(0L>-}2@f2s)ncc&6=Ta$=BEAAeOYlgPpE=Xi z&Oq;d{z*qT$b@O?JP^>u4QLaZS48@QgZerCmlOc#3)BOZ6bY~q6y#yKM4(KEf9)UGB1$aic=lv?inS{rTlGB z-FU6t9_*rcGvJU#Fw43sAY>pGJam94%b7>Uj8#a4=i^zgs}rqnU(iM3qbKYbF2e{*9@T1prMh&~{* zy%Q11M7RM3bD_JnoDnMP+Ts6$*Un1Yech12MeeE}#K}avB2v?k6_|lqBcx?u=l>taRe| zW%FpuFiXVcQH}Z|F=u=CThFA-fPbo31EUA6-rI#w5Rj~yhbW0WfckfS3cQ(4oZrvf z6^^k<7jaMo9#X-Zq-C_Wb4?D92v#^HudD42V+yLz``Zv%tD6la{2N+R@^X;Rsz4YW z!73DdqqlNX$W6x_(AfDgr?GqX2FoSosw;A2{Pj|D^n*T;4_$hNkFY<-IXu--*NF3C zMSHmXJ+utu1LQk1!9e3U5jKk^GFnpvMU*gHiSR3{5LYz zR6$#%kR?#(Lm=sJnd*ikVYrq>$RBYl-iX`Jz0->Tz{>D`xO>yF=D(QA8-|XlYtA_j z(LtkXY!ejvpq#-M_=~jF0qUwE`6rF^<6X)~J?+Yttk0FlK>t(}AHd(qn<4)nGkt<* literal 0 HcmV?d00001 diff --git a/web/app/assets/javascripts/react-components/AccountSchoolScreen.js.jsx.coffee b/web/app/assets/javascripts/react-components/AccountSchoolScreen.js.jsx.coffee index 6d43f38ea..73dc99586 100644 --- a/web/app/assets/javascripts/react-components/AccountSchoolScreen.js.jsx.coffee +++ b/web/app/assets/javascripts/react-components/AccountSchoolScreen.js.jsx.coffee @@ -92,7 +92,8 @@ profileUtils = context.JK.ProfileUtils schoolName: null, studentInvitations: null, teacherInvitations: null, - updating: false + updating: false, + distributions: [] } isSchoolManaged: () -> @@ -187,9 +188,15 @@ profileUtils = context.JK.ProfileUtils removeFromSchool: (id, isTeacher, e) -> if isTeacher - rest.deleteSchoolTeacher({id: this.state.school.id, teacher_id: id}).done((response) => @removeFromSchoolDone(response)).fail((jqXHR) => @removeFromSchoolFail(jqXHR)) + rest.deleteSchoolTeacher({ + id: this.state.school.id, + teacher_id: id + }).done((response) => @removeFromSchoolDone(response)).fail((jqXHR) => @removeFromSchoolFail(jqXHR)) else - rest.deleteSchoolStudent({id: this.state.school.id, student_id: id}).done((response) => @removeFromSchoolDone(response)).fail((jqXHR) => @removeFromSchoolFail(jqXHR)) + rest.deleteSchoolStudent({ + id: this.state.school.id, + student_id: id + }).done((response) => @removeFromSchoolDone(response)).fail((jqXHR) => @removeFromSchoolFail(jqXHR)) removeFromSchoolDone: (school) -> context.JK.Banner.showNotice("User removed", "User was removed from your school.") @@ -205,7 +212,7 @@ profileUtils = context.JK.ProfileUtils `

- +
{user.name} @@ -237,7 +244,8 @@ profileUtils = context.JK.ProfileUtils if this.state.school.teachers? && this.state.school.teachers.length > 0 for teacher in this.state.school.teachers - teachers.push(@renderUser(teacher.user, true)) + if teacher.user + teachers.push(@renderUser(teacher.user, true)) else teachers = `

No teachers

` @@ -302,8 +310,39 @@ profileUtils = context.JK.ProfileUtils field: true }) - cancelClasses = { "button-grey": true, "cancel" : true, disabled: this.state.updating } - updateClasses = { "button-orange": true, "update" : true, disabled: this.state.updating } + cancelClasses = {"button-grey": true, "cancel": true, disabled: this.state.updating} + updateClasses = {"button-orange": true, "update": true, disabled: this.state.updating} + + if this.state.school.education + management = null + else + management = `
+

Management Preference

+ +
+
+ +
+
+ +
+
+
+ + + +
All emails relating to lesson scheduling will go to this email if school owner manages + scheduling. +
+ {correspondenceEmailErrors} +
+
` + `
@@ -316,29 +355,7 @@ profileUtils = context.JK.ProfileUtils
-

Management Preference

- -
-
- -
-
- -
-
-
- - - -
All emails relating to lesson scheduling will go to this email if school owner manages - scheduling. -
- {correspondenceEmailErrors} -
+ {management}

Payments

@@ -365,7 +382,7 @@ profileUtils = context.JK.ProfileUtils

teachers:

INVITE TEACHER -
+
{teacherInvitations} @@ -397,6 +414,73 @@ profileUtils = context.JK.ProfileUtils

Coming soon

` + paymentsToYou: () -> + rows = [] + + for paymentHistory in this.state.distributions + paymentMethod = 'Stripe' + + if paymentHistory.distributed + date = paymentHistory.teacher_payment.teacher_payment_charge.last_billing_attempt_at + status = 'Paid' + else + date = paymentHistory.created_at + if paymentHistory.not_collectable + status = 'Uncollectible' + else if !paymentHistory.teacher?.teacher?.stripe_account_id? + status = 'No Stripe Acct' + else + status = 'Collecting' + + + date = context.JK.formatDate(date, true) + description = paymentHistory.description + + if paymentHistory.teacher_payment? + amt = paymentHistory.teacher_payment.real_distribution_in_cents + else + amt = paymentHistory.real_distribution_in_cents + + displayAmount = ' $' + (amt / 100).toFixed(2) + + amountClasses = {status: status} + + row = + ` + {date} + {paymentMethod} + {description} + {status} + {displayAmount} + ` + rows.push(row) + + `
+ + + + + + + + + + + + {rows} + + +
DATEMETHODDESCRIPTIONSTATUSAMOUNT
+ Next + +
No more payment history
+
+ BACK +
+
+
` + + agreement: () -> `

The agreement between your music school and JamKazam is part of JamKazam's terms of service. You can find the diff --git a/web/app/assets/javascripts/react-components/BookLesson.js.jsx.coffee b/web/app/assets/javascripts/react-components/BookLesson.js.jsx.coffee index f19dce5ee..018a9bfc7 100644 --- a/web/app/assets/javascripts/react-components/BookLesson.js.jsx.coffee +++ b/web/app/assets/javascripts/react-components/BookLesson.js.jsx.coffee @@ -99,7 +99,7 @@ UserStore = context.UserStore userDetailDone: (response) -> if response.id == @state.teacherId - school_on_school = response.teacher.school_id? && @state.user?.school_id? && response.teacher.school_id == @state.user.school_id + school_on_school = response.teacher.school_id? && @state.user?.school_id? && response.teacher.school_id == @state.user.school_id && !response.teacher.school.education @setState({teacher: response, isSelf: response.id == context.JK.currentUserId, school_on_school: school_on_school}) else logger.debug("BookLesson: ignoring teacher details", response.id, @state.teacherId) diff --git a/web/app/assets/javascripts/react-components/InviteSchoolUserDialog.js.jsx.coffee b/web/app/assets/javascripts/react-components/InviteSchoolUserDialog.js.jsx.coffee index b83d3a4c4..ff6969219 100644 --- a/web/app/assets/javascripts/react-components/InviteSchoolUserDialog.js.jsx.coffee +++ b/web/app/assets/javascripts/react-components/InviteSchoolUserDialog.js.jsx.coffee @@ -1,8 +1,9 @@ context = window +SchoolStore = context.SchoolStore @InviteSchoolUserDialog = React.createClass({ - mixins: [Reflux.listenTo(@AppStore, "onAppInit")] + mixins: [Reflux.listenTo(@AppStore, "onAppInit"), Reflux.listenTo(SchoolStore, "onSchoolChanged")] teacher: false beforeShow: (args) -> @@ -14,6 +15,9 @@ context = window @setState({inviteErrors: null, teacher: args.d1}) afterHide: () -> + onSchoolChanged: (schoolState) -> + @setState(schoolState) + onAppInit: (@app) -> dialogBindings = { 'beforeShow': @beforeShow, @@ -22,12 +26,11 @@ context = window @app.bindDialog('invite-school-user', dialogBindings); - componentDidMount: () -> @root = $(@getDOMNode()) getInitialState: () -> - {inviteErrors: null} + {inviteErrors: null, school: null} doCancel: (e) -> e.preventDefault() @@ -41,15 +44,20 @@ context = window firstName = @root.find('input[name="first_name"]').val() school = context.SchoolStore.getState().school @setState({inviteErrors: null}) - rest.createSchoolInvitation({id: school.id, as_teacher: this.state.teacher, email: email, last_name: lastName, first_name: firstName }).done((response) => @createDone(response)).fail((jqXHR) => @createFail(jqXHR)) + rest.createSchoolInvitation({ + id: school.id, + as_teacher: this.state.teacher, + email: email, + last_name: lastName, + first_name: firstName + }).done((response) => @createDone(response)).fail((jqXHR) => @createFail(jqXHR)) - createDone:(response) -> + createDone: (response) -> context.SchoolActions.addInvitation(response) context.JK.Banner.showNotice("invitation sent", "Your invitation has been sent!") @app.layout.closeDialog('invite-retailer-user') createFail: (jqXHR) -> - handled = false if jqXHR.status == 422 @@ -60,15 +68,57 @@ context = window if !handled @app.ajaxError(jqXHR, null, null) - render: () -> + renderEducation: () -> + `

+
+ +

How to Invite Your Students

+
+
+ +

+ Please copy and paste the text below into the email application you use to communicate with students and + parents in your music program. This is a suggested starting point, but you may edit the message as you prefer. + Please make sure the web page link in this message is included in the email you send and is unchanged because + students must use this specific link to sign up so that they will be properly associated with your school. +

+ + + +
+ DONE +
+
+
` + + close: (e) -> + e.preventDefault() + @app.layout.closeDialog('invite-school-user'); + + educationCopyEmailText: () -> + path = context.JK.makeAbsolute("/school/#{this.state.school.id}/student") + + msg = "Hello Students & Parents - + +I'm writing to make you aware of a very interesting new option for private music lessons. A company called JamKazam has built remarkable new technology that lets musicians play together live in sync with studio quality audio from different locations over the Internet. Here's an example: https://www.youtube.com/watch?v=I2reeNKtRjg. Now they have built an online music lesson service that uses this technology: https://www.youtube.com/watch?v=wdMN1fQyD9k. + +\n\nThis means that students can now take lessons online and much more conveniently from home. Parents don't have to leave work early to drive students to and from lessons during rush hour. A 30-minute lesson is just a 30-minute lesson at home, not a 90-minute expedition across town. And students can record lessons to refer back to them later. + +\n\nIf the convenience of online lessons is attractive to your family, then you can use this link to sign up for online lessons: #{path}. After you sign up, someone from JamKazam will reach out to answer your questions and help you get set up and ready to go. Your student can continue to take lessons from the same instructor through this service if desired. The student will need access to a Windows or Mac computer, and you'll need basic Internet service at home. The service uses the built-in microphone and headphone jack on the computer for audio. You can also purchase a pro audio upgrade package from JamKazam for $49.99 that includes an audio interface (a small box that connects to the computer via a USB cable), a microphone, a microphone cable, and a microphone stand. This is optional, but will deliver superior audio quality in lessons. + +\n\nThe music program directors are primarily concerned with giving our students the highest quality music education possible, so we encourage you to make whatever decision you feel is best for the student. That said, for students who take lessons through the JamKazam service, a portion of the lesson fees are distributed back into our music program booster fund, which helps to fund the program's expenses, and is a nice additional benefit. If you have more questions, you can send an email to support@jamkazam.com." + + return msg + + renderSchool: () -> firstNameErrors = context.JK.reactSingleFieldErrors('first_name', @state.inviteErrors) lastNameErrors = context.JK.reactSingleFieldErrors('last_name', @state.inviteErrors) emailErrors = context.JK.reactSingleFieldErrors('email', @state.inviteErrors) - firstNameClasses = classNames({first_name: true, error: firstNameErrors?, field: true}) - lastNameClasses = classNames({last_name: true, error: lastNameErrors?, field: true}) - emailClasses = classNames({email: true, error: emailErrors?, field: true}) + firstNameClasses = classNames({first_name: true, error: firstNameErrors?, field: true}) + lastNameClasses = classNames({last_name: true, error: lastNameErrors?, field: true}) + emailClasses = classNames({email: true, error: emailErrors?, field: true}) if @state.teacher title = 'invite teacher' @@ -98,19 +148,19 @@ context = window
- + {firstNameErrors}
- + {lastNameErrors}
- + {emailErrors}
@@ -121,4 +171,16 @@ context = window
` + render: () -> + school = this.state.school + + if !school? + return `
no school
` + + if school.education + @renderEducation() + else + @renderSchool() + + }) \ No newline at end of file diff --git a/web/app/assets/javascripts/react-components/TeacherProfile.js.jsx.coffee b/web/app/assets/javascripts/react-components/TeacherProfile.js.jsx.coffee index 71c25bdd6..0e1177774 100644 --- a/web/app/assets/javascripts/react-components/TeacherProfile.js.jsx.coffee +++ b/web/app/assets/javascripts/react-components/TeacherProfile.js.jsx.coffee @@ -145,7 +145,9 @@ proficiencyDescriptionMap = { if @state.user?['has_booked_test_drive_with_student'] @showBuyNormalLessonBubble() else - if @user['remaining_test_drives'] > 0 + if @state.user?['same_school_with_student'] + @showBuyNormalLessonBubble() + else if @user['remaining_test_drives'] > 0 @showUseRemainingTestDrivesBubble() else if @user['can_buy_test_drive?'] @showBuyTestDriveBubble() diff --git a/web/app/assets/javascripts/react-components/landing/JamClassEducationLandingBottomPage.js.jsx.coffee b/web/app/assets/javascripts/react-components/landing/JamClassEducationLandingBottomPage.js.jsx.coffee new file mode 100644 index 000000000..2aee0cc63 --- /dev/null +++ b/web/app/assets/javascripts/react-components/landing/JamClassEducationLandingBottomPage.js.jsx.coffee @@ -0,0 +1,378 @@ +context = window +rest = context.JK.Rest() + +@JamClassEducationLandingBottomPage = React.createClass({ + + render: () -> + `
+
+

How JamClass by JamKazam Can Help Your Music School

+ +

Online music lessons offer major advantages to your students, private lesson teachers, and your school's + booster program.

+ +

+ Students can take lessons much more conveniently from home, while enjoying studio quality audio and while + retaining the ability to play live in sync with their instructor. Students can take lessons from the best + teacher vs. settling for someone who lives close by. Parents don't have to leave work early to drive students + to and from lessons during rush hour, while carting siblings along to lessons. A 30-minute lesson is just a + 30-minute lesson, not a 90-minute expedition. And students can record lessons to refer back to them later. +

+ +

+ Teachers can now provide lessons to students nearly anywhere, rather than being constrained to students who + live within a 30-minute drive. Teachers don't have to spend as much time driving to schools and to students' + homes as they do teaching, so they can travel less, teach more, and earn more. And teachers can provide + instruction to students from underserved schools that are located in areas that are more difficult to reach. +

+ + +

+ Even the booster program benefits, as JamKazam funnels a portion of lesson fees back into the music program + booster fund, helping to pay for trips, instrument repairs, and other music program expenses - all without + students selling things, and without additional time or effort expended by the music program director. +

+ +

Some teachers and students have historically tried using Skype to power online lessons, but have found that + the lesson experience is significantly diminished. Why? Because Skype and similar apps were built for voice + chat – not to deliver online music lessons. This is a major problem. Voice technology processes all audio as + if it were a spoken human voice, which makes music sound awful in online sessions – so bad that teachers can’t + assess the student’s tone and sometimes even the pitch of what they are playing. These apps also have very + high latency – a technical term that means that the student and teacher cannot play together, another + important requirement for productive lessons. Since Skype wasn’t built for music, it also lacks many other + basic features to support effective lessons, like a metronome, mixers, backing tracks, etc. +

+ +

+ At JamKazam, we’ve spent years designing, patenting, and building technology specifically to enable musicians + to play online live in sync with studio quality audio. We’ve built a wide variety of critical online music + performance features into this platform. And now we’ve built a lesson marketplace on top of this foundation, + and crafted a partner program specifically to meet the needs of secondary education music programs. The bottom + line is that your students, private lesson teachers, and your music program's booster fund can now all "win" + by adopting this amazing new Internet service. And you don't have to do it all at once. You can simply make + this available as an option to students and parents who decide this is a good fit for them and will help them. +

+ +

+ If this sounds interesting to you, read on to learn more about some of the top features of JamClass by + JamKazam. +

+ +
+

JamClass Kudos

+ +
+ + +

Scott Himel

+ +
+ Texas high school band director +
+
+
+ + +

Justin Pierce

+ +
+ Masters degree in jazz studies, performer in multiple bands, saxophone instructor +
+
+
+ + +

Dave Sebree

+ +
+ Founder of Austin School of Music, Gibson-endorsed guitarist, touring musician +
+
+
+ + +

Sara Nelson

+ +
+ Cellist for Austin Lyric Opera, frequently recorded with major artists +
+
+
+
+ +
+
+

+
1
+ Play Live In Sync From Different Locations +

+

+

+
+