From 82a343fa715f023b97a4ef3b955f255ae8fd62b0 Mon Sep 17 00:00:00 2001 From: Tyler Renelle Date: Sat, 4 Feb 2012 17:14:39 -0500 Subject: [PATCH] Purchasing now works, refactored money to shared --- app/controllers/rewards_controller.rb | 15 +++++++++++++++ app/views/habits/index.html.erb | 4 ++-- app/views/habits/vote.js.erb | 4 ++-- app/views/rewards/buy.js.erb | 1 + app/views/{habits => shared}/_money.erb | 0 5 files changed, 20 insertions(+), 4 deletions(-) create mode 100644 app/views/rewards/buy.js.erb rename app/views/{habits => shared}/_money.erb (100%) diff --git a/app/controllers/rewards_controller.rb b/app/controllers/rewards_controller.rb index a655408846..ff25997c4f 100644 --- a/app/controllers/rewards_controller.rb +++ b/app/controllers/rewards_controller.rb @@ -61,4 +61,19 @@ class RewardsController < ApplicationController format.json { head :no_content } end end + + + def buy + @reward = current_user.rewards.find(params[:id]) + current_user.money -= @reward.value + current_user.save + + respond_to do |format| + # format.html { render action: "edit" } + # format.json { render json: @habit.errors, status: :unprocessable_entity } + format.js + end + end + + end diff --git a/app/views/habits/index.html.erb b/app/views/habits/index.html.erb index f896a354a3..79ba6385ba 100644 --- a/app/views/habits/index.html.erb +++ b/app/views/habits/index.html.erb @@ -52,12 +52,12 @@

Rewards - <%= render 'money'%> + <%= render 'shared/money'%>

<% @rewards.each do |reward| %>
  • - <%= link_to(image_tag('dollar.png'), { :controller=>"reward", :action => "buy", :id => reward.id }, :remote=>true) %> + <%= link_to(image_tag('dollar.png'), { :controller=>"rewards", :action => "buy", :id => reward.id }, :remote=>true) %> <%= reward.name %>
    <%= link_to 'Edit', edit_reward_path(reward) %> diff --git a/app/views/habits/vote.js.erb b/app/views/habits/vote.js.erb index e2d46a4687..44f9319c36 100644 --- a/app/views/habits/vote.js.erb +++ b/app/views/habits/vote.js.erb @@ -1,5 +1,5 @@ <% unless @habit.habit_type==Habit::ONE_TIME %> $('#habit_<%= @habit.id %>').replaceWith("<%= escape_javascript(render :partial => "habit", :locals => { :habit => @habit }) %>"); <% end %> -$('#progressbar').replaceWith("<%= escape_javascript(render :partial => "progressbar") %>"); -$('#money').replaceWith("<%= escape_javascript(render 'money') %>"); +$('#progressbar').replaceWith("<%= escape_javascript(render :partial => "shared/progressbar") %>"); +$('#money').replaceWith("<%= escape_javascript(render 'shared/money') %>"); diff --git a/app/views/rewards/buy.js.erb b/app/views/rewards/buy.js.erb new file mode 100644 index 0000000000..6f4dd4b7cf --- /dev/null +++ b/app/views/rewards/buy.js.erb @@ -0,0 +1 @@ +$('#money').replaceWith("<%= escape_javascript(render 'shared/money') %>"); diff --git a/app/views/habits/_money.erb b/app/views/shared/_money.erb similarity index 100% rename from app/views/habits/_money.erb rename to app/views/shared/_money.erb