* tweak gift card landing

This commit is contained in:
Seth Call 2015-11-30 11:03:32 -06:00
parent 32d32b3393
commit b7cbb86e3b
4 changed files with 47 additions and 13 deletions

View File

@ -34,8 +34,9 @@ rest = context.JK.Rest()
<div className="preview-and-action-box">
<img src="/assets/landing/jamtrack_landing_arrow_1.png" className="arrow1" />
<img src="/assets/landing/jamtrack_landing_arrow_2.png" className="arrow2" />
<div className="preview-jamtrack-header">
Preview JamTrack
<div className="preview-jamtrack-header gift-card">
Preview A JamTrack
<div className="jamtrack-title">"{this.props.jam_track.name}"</div>
</div>
<div className={classNames({'preview-area': true, 'gift-card': true})}>
<p>Click the play buttons below to preview the master mix and 20-second samples of all the isolated tracks.</p>
@ -81,7 +82,7 @@ rest = context.JK.Rest()
context.location = '/client#/shoppingCart'
else
@setState({done: true})
context.location = '/client#/checkoutPayment'
context.location = '/client#/shoppingCart'
).fail((jqXHR, textStatus, errorMessage) =>
if jqXHR.status == 422

View File

@ -200,6 +200,7 @@ body.web.individual_jamtrack {
}
.cta-button {
cursor:pointer;
background-color: $cta-color;
&.processing {
@ -328,6 +329,16 @@ body.web.individual_jamtrack {
border-width: 0 0 $chunkyBorderWidth;
border-style: solid;
border-color: $copy-color-on-dark;
&.gift-card {
padding:20px 0 10px;
.jamtrack-title {
margin-top:10px;
font-size:18px;
font-style:italic;
}
}
}
.preview-area {

View File

@ -47,10 +47,10 @@ div layout="screen" layout-id="checkoutSignin" id="checkoutSignInScreen" class="
p.facebook-prompt Or sign in using Facebook:
= link_to image_tag("content/button_facebook_signin.png", {:width => 249, :height => 46}), '/auth/facebook', class: "signin-facebook"
.right-side
h3 NOT A MEMBER YET?
h3 NOT A MEMBER?
p.signup-later-prompt
| Thousands of musicians are now registered members of JamKazam. Click the NEXT button below to join us, and welcome!
| Click the NEXT button below to enter the address and payment information for your purchase.
.actions
a.btnNext.button-orange NEXT

View File

@ -57,8 +57,16 @@ describe "Gift Card Landing", :js => true, :type => :feature, :capybara_feature
find('a.browse-all')['href'].should eq("/client?search=#/jamtrack/search")
find('button.five-jt', text: 'ADD $10 CARD TO CART').trigger(:click)
# land in shopping cart first
find('.proceed-checkout').trigger(:click)
find('h1', text: 'check out')
# checkoutSignin page now
find('h3', text: 'NOT A MEMBER?')
# hit 'NEXT' to create account and enter payment info
find('.btnNext.button-orange').trigger(:click)
find('.hint.cvv')
# fill out all billing info and account info
fill_in 'billing-first-name', with: 'Seth'
@ -70,9 +78,12 @@ describe "Gift Card Landing", :js => true, :type => :feature, :capybara_feature
fill_in 'card-number', with: '4111111111111111'
fill_in 'card-verify', with: '012'
# fill in user/email/tos
fill_in 'email', with: 'bogus+gc1@jamkazam.com'
fill_in 'password', with: 'jam123'
within('#checkout-payment-info') do
# fill in user/email/tos
fill_in 'email', with: 'bogus+gc1@jamkazam.com'
fill_in 'password', with: 'jam123'
end
find('#divJamKazamTos ins.iCheck-helper').trigger(:click) # accept TOS
# try to submit, and see order page
@ -132,8 +143,16 @@ describe "Gift Card Landing", :js => true, :type => :feature, :capybara_feature
find('a.browse-all')['href'].should eq("/client?search=#/jamtrack/search")
find('button.ten-jt', text: 'ADD $20 CARD TO CART').trigger(:click)
# land in shopping cart first
find('.proceed-checkout').trigger(:click)
find('h1', text: 'check out')
# checkoutSignin page now
find('h3', text: 'NOT A MEMBER?')
# hit 'NEXT' to create account and enter payment info
find('.btnNext.button-orange').trigger(:click)
find('.hint.cvv')
# fill out all billing info and account info
fill_in 'billing-first-name', with: 'Seth'
@ -145,9 +164,12 @@ describe "Gift Card Landing", :js => true, :type => :feature, :capybara_feature
fill_in 'card-number', with: '4111111111111111'
fill_in 'card-verify', with: '012'
# fill in user/email/tos
fill_in 'email', with: 'bogus+gc2@jamkazam.com'
fill_in 'password', with: 'jam123'
within('#checkout-payment-info') do
# fill in user/email/tos
fill_in 'email', with: 'bogus+gc2@jamkazam.com'
fill_in 'password', with: 'jam123'
end
find('#divJamKazamTos ins.iCheck-helper').trigger(:click) # accept TOS
# try to submit, and see order page