Merge branch '29_cart_and_collections'

Author: marcelja

app/controllers/exercises_controller.rb

@@ -2,7 +2,7 @@
 
 class ExercisesController < ApplicationController
   load_and_authorize_resource
-  before_action :set_exercise, only: [:show, :edit, :update, :destroy, :push_external]
+  before_action :set_exercise, only: [:show, :edit, :update, :destroy, :add_to_cart,:push_external]
 
   rescue_from CanCan::AccessDenied do |_exception|
     redirect_to root_path, alert: 'You are not authorized for this exercise.'
@@ -78,6 +78,15 @@ def destroy
     end
   end
 
+  def add_to_cart
+    unless current_user.cart
+      Cart.create(user: current_user)
+    end
+    cart = Cart.find_by(user: current_user)
+    cart.exercises << @exercise
+    redirect_to @exercise, notice: 'Exercise was successfully added to your cart.'
+  end
+
   def exercises_all
     @exercises = Exercise.all
   end

app/models/ability.rb

@@ -9,6 +9,8 @@ def initialize(user)
         can :show, Exercise
         can :create, Exercise
         can :duplicate, Exercise
+        can :export, Exercise
+        can :add_to_cart, Exercise
         can :read, Exercise
         can :edit, Exercise do |exercise|
           exercise.user == user

app/views/exercises/show.html.erb

@@ -61,7 +61,7 @@
     <% end %>
 </dl>
 
-<% if can? :manage, Exercise%>
+<% if can? :export, Exercise%>
   <dl class="dl-horizontal">
     <dt><%= 'Export to ... :' %></dt>
     <dd>
@@ -71,7 +71,17 @@
         <%= button_tag 'Submit', class: 'btn btn-success btn-xs' %>
       <% end %>
     </dd>
+
+    <dt>or<br><br></dt>
+    <dd></dd>
+    <dt>Add to cart :</dt>
+    <dd>
+      <%= button_to 'Add to cart', add_to_cart_path(@exercise), class: 'btn btn-primary btn-xs' %>
+    </dd>
   </dl>
+
+
+
 <% end %>
 
 <div class="actions btn-group" role="group">
@@ -83,8 +93,3 @@
   <%= link_to 'Back', exercises_path,  class: 'btn btn-default' %>
 
 </div>
-
-<script>
-
-</script>
-

app/views/layouts/application.html.erb

@@ -29,7 +29,7 @@
         <%= menu_group pull: :right do %>
             <% if current_user %>
               <% if current_user.cart %>
-                <%= menu_item 'Cart (' + current_user.cart_count.to_s + ')', current_user.cart %>
+                <%= menu_item 'Cart (' + current_user.cart_count.to_s + ')', cart_path(current_user.cart) %>
               <% end %>
               <%= menu_item current_user.email, user_path(current_user) %>
               <%= menu_item 'Log out',  logout_path, method: :delete %>

config/routes.rb

@@ -18,6 +18,7 @@
   get 'exercises/exercises_all'
 
   get 'exercises/:id/duplicate', to: 'exercises#duplicate', as: 'duplicate_exercise'
+  post 'exercises/:id/add_to_cart', to: 'exercises#add_to_cart', as: 'add_to_cart'
 
   resources :labels
   resources :label_categories