* VRFS-3193 - indicate on jamtrack browse page that 1st jamtrack is free

This commit is contained in:
Seth Call 2015-05-05 16:38:29 -05:00
parent adfc3d18a9
commit 05f5cd619a
4 changed files with 28 additions and 5 deletions

View File

@ -23,7 +23,7 @@ module JamRuby
end
def has_redeemable_jamtrack
true
APP_CONFIG.one_free_jamtrack_per_user
end
end
end

View File

@ -24,8 +24,15 @@ context.JK.JamTrackScreen=class JamTrackScreen
beforeShow:(data) =>
this.setFilterFromURL()
this.refresh()
if context.JK.currentUserId?
@app.user().done((user) =>
@user = user
this.refresh()
)
else
this.refresh()
afterShow:(data) =>
beforeHide: () =>
@ -145,7 +152,7 @@ context.JK.JamTrackScreen=class JamTrackScreen
@currentPage++
this.buildQuery()
this.registerInfiniteScroll()
registerInfiniteScroll:() =>
that = this
@ -262,9 +269,14 @@ context.JK.JamTrackScreen=class JamTrackScreen
if track.part != ''
track.instrument_desc += ' (' + track.part + ')'
free_state = if gon.global.one_free_jamtrack_per_user then 'free' else 'non-free'
if @user
free_state = if @user.free_jamtrack then 'free' else 'non-free'
options =
jamtrack: trackRow
expanded: false
free_state: free_state
@jamtrackItem = $(context._.template($('#template-jamtrack').html(), options, variable: 'data'))
that.renderJamtrack(@jamtrackItem, jamtrack)
that.registerEvents(@jamtrackItem)

View File

@ -146,6 +146,15 @@
.jamtrack-price {
margin-top: 5px;
font-size: 20px;
&.free {
margin-top:0;
.free-state {
font-size: 11px;
margin-top: 5px;
display:block;
}
}
}
.jamtrack-add-cart, .jamtrack-add-cart-disabled {

View File

@ -65,8 +65,10 @@ script#template-jamtrack type='text/template'
td.jamtrack-action
/ a.play-button href="#" data-jamtrack-id="{{data.jamtrack.id}}"
/ =image_tag "shared/play_button.png"
.jamtrack-price
.jamtrack-price class="{{data.free_state}}"
| {{"$ " + data.jamtrack.price}}
.free-state.hidden
| (first one is FREE)
="{% if (data.jamtrack.purchased) { %}"
a.jamtrack-add-cart-disabled.button-grey.button-disabled href="javascript:void(0)" PURCHASED
="{% } else if (data.jamtrack.added_cart) { %}"