diff --git a/web/app/assets/javascripts/react-components/AccountPaymentHistoryScreen.js.jsx.coffee b/web/app/assets/javascripts/react-components/AccountPaymentHistoryScreen.js.jsx.coffee index 5bc85d3f4..0fdb13d44 100644 --- a/web/app/assets/javascripts/react-components/AccountPaymentHistoryScreen.js.jsx.coffee +++ b/web/app/assets/javascripts/react-components/AccountPaymentHistoryScreen.js.jsx.coffee @@ -121,6 +121,11 @@ profileUtils = context.JK.ProfileUtils resetErrors: () -> @setState({ccError: null, cvvError: null, expiryError: null, billingInUSError: null, zipCodeError: null, nameError: null}) + onBack: (e) -> + e.preventDefault() + + window.history.go(-1); + checkboxChanged: (e) -> checked = $(e.target).is(':checked') @@ -515,7 +520,7 @@ profileUtils = context.JK.ProfileUtils Next
No more payment history
- BACK + BACK

` diff --git a/web/app/assets/javascripts/react-components/JamClassScreen.js.jsx.coffee b/web/app/assets/javascripts/react-components/JamClassScreen.js.jsx.coffee index e96a1c6d1..d9f78a228 100644 --- a/web/app/assets/javascripts/react-components/JamClassScreen.js.jsx.coffee +++ b/web/app/assets/javascripts/react-components/JamClassScreen.js.jsx.coffee @@ -52,6 +52,7 @@ UserStore = context.UserStore $node.lessonSessionActions(lesson).on(context.JK.EVENTS.LESSON_SESSION_ACTION, @lessonSessionActionSelected) )) + context.JK.popExternalLinks(@root) lessonSessionActionSelected: (e, data) -> lessonId = data.options.id @@ -332,7 +333,7 @@ UserStore = context.UserStore

JamClass instructors are each individually screened to ensure that they are highly qualified music teachers, - equipped to teach effectively online, and background checked. + and are equipped with the right gear to teach effectively online.

diff --git a/web/app/assets/javascripts/react-components/stores/StripeStore.js.coffee b/web/app/assets/javascripts/react-components/stores/StripeStore.js.coffee index e8398299e..7b2cd26c6 100644 --- a/web/app/assets/javascripts/react-components/stores/StripeStore.js.coffee +++ b/web/app/assets/javascripts/react-components/stores/StripeStore.js.coffee @@ -29,6 +29,25 @@ rest = new context.JK.Rest() email = encodeURIComponent(user.email) firstName = encodeURIComponent(user.first_name) lastName = encodeURIComponent(user.last_name) - window.location.href = "/auth/stripe_connect?redirect_uri=#{redirectUri}&scope=read_write&stripe_user[url]=#{teacherProfileUri}&stripe_user[email]=#{email}&stripe_user[first_name]=#{firstName}&stripe_user[last_name]=#{lastName}" + + url = "/auth/stripe_connect?redirect_uri=#{redirectUri}&scope=read_write&stripe_user[url]=#{teacherProfileUri}&stripe_user[email]=#{email}&stripe_user[first_name]=#{firstName}&stripe_user[last_name]=#{lastName}" + + # product description + productDescription = "Online music lessons billed either per lesson or per month" + url += "&stripe_user[product_description]=#{productDescription}" + + # business type + url += "&stripe_user[business_type]=sole_prop" + + # business name + businessName = "#{user.name} Lessons" + url += "&stripe_user[business_name]=#{businessName}" + + # country + if user.country? + url += "&stripe_user[country]=#{encodeURIComponent(user.country)}" + + + window.location.href = url } )