From f3f655720cff39c55668bafd40d032cd7c379267 Mon Sep 17 00:00:00 2001 From: Steven Miers Date: Sun, 15 Mar 2015 20:22:02 -0500 Subject: [PATCH] VRFS-2896 : Show proper state on jam track re: purchased or already in cart. --- web/app/views/api_jam_tracks/show.rabl | 4 ++++ web/app/views/clients/_jamtrack.html.slim | 4 +++- web/spec/features/jamtrack_shopping_spec.rb | 2 +- 3 files changed, 8 insertions(+), 2 deletions(-) diff --git a/web/app/views/api_jam_tracks/show.rabl b/web/app/views/api_jam_tracks/show.rabl index cab264aa5..021953616 100644 --- a/web/app/views/api_jam_tracks/show.rabl +++ b/web/app/views/api_jam_tracks/show.rabl @@ -10,6 +10,10 @@ node :added_cart do |item| current_user.shopping_carts.where("cart_id='?'",item.id).count != 0 end +node :purchased do |item| + !!item.right_for_user(current_user) +end + child(:jam_track_tracks => :tracks) { attributes :id, :part, :instrument } diff --git a/web/app/views/clients/_jamtrack.html.slim b/web/app/views/clients/_jamtrack.html.slim index cc7ee4cfe..793a53956 100644 --- a/web/app/views/clients/_jamtrack.html.slim +++ b/web/app/views/clients/_jamtrack.html.slim @@ -94,8 +94,10 @@ script type='text/template' id='template-jamtrack' / =image_tag "shared/play_button.png" .jamtrack-price | {{"$ " + data.jamtrack.price}} - ="{% if (data.jamtrack.added_cart) { %}" + ="{% if (data.jamtrack.purchased) { %}" a.jamtrack-add-cart-disabled.button-grey.button-disabled href="javascript:void(0)" Purchased + ="{% } else if (data.jamtrack.added_cart) { %}" + a.jamtrack-add-cart-disabled.button-grey.button-disabled href="client#/shoppingCart" Already In Cart ="{% } else { %}" a.jamtrack-add-cart.button-orange href="#" data-jamtrack-id="{{data.jamtrack.id}}" Add to Cart ="{% }; %}" diff --git a/web/spec/features/jamtrack_shopping_spec.rb b/web/spec/features/jamtrack_shopping_spec.rb index 853e1a074..251053d1f 100644 --- a/web/spec/features/jamtrack_shopping_spec.rb +++ b/web/spec/features/jamtrack_shopping_spec.rb @@ -53,7 +53,7 @@ describe "JamTrack Shopping", :js => true, :type => :feature, :capybara_feature end if options[:added_cart] - jamtrack_record.find('a.jamtrack-add-cart-disabled', text: 'Purchased') + jamtrack_record.find('a.jamtrack-add-cart-disabled', text: 'Already In Cart') else jamtrack_record.find('a.jamtrack-add-cart.button-orange', text: 'Add to Cart') end