db/migrate/20091022150926_add_type_to_donations.rb app/controllers/myspot/donation_amounts_controller.rb @@ -38,7 +38,11 @@ class Myspot::DonationsController < ApplicationController end def new_resource - current_user.donations.new(params[:donation]) + current_user.donations.new(params[:donation]) + # TODO: figure out why donation_type does not get properly assigned with params / should not need to assign after new + # d = Donation.new(params[:donation]) + # d.donation_type = params[:donation][:donation_type] + # d end def find_resources app/controllers/myspot/donations_controller.rb @@ -46,6 +46,7 @@ class Donation < ActiveRecord::Base belongs_to :user belongs_to :pitch belongs_to :purchase + belongs_to :credit belongs_to :group validates_presence_of :pitch_id validates_presence_of :user_id @@ -53,13 +54,15 @@ class Donation < ActiveRecord::Base validates_numericality_of :amount, :greater_than => 0 validate_on_update :disable_updating_paid_donations, :check_donation, :if => lambda { |me| me.pitch } validate_on_create :check_donation, :if => lambda { |me| me.pitch } - + + #default_scope :conditions => {:donation_type => "payment"} named_scope :unpaid, :conditions => "status = 'unpaid'" named_scope :paid, :conditions => "status = 'paid'" named_scope :from_organizations, :include => :user, :conditions => "users.type = 'organization'" named_scope :for_pitch, lambda {|pitch| { :conditions => {:pitch_id => pitch.id} } } named_scope :by_user, lambda {|user| { :conditions => {:user_id => user.id} } } - + named_scope :other_than, lambda {|donation| { :conditions => "id != #{donation.id}" } } + after_save :update_pitch_funding, :send_thank_you, :if => lambda {|me| me.paid?} def self.createable_by?(user) @@ -88,7 +91,7 @@ class Donation < ActiveRecord::Base end def update_pitch_funding - pitch.current_funding += amount + pitch.current_funding += amount.to_f pitch.save end @@ -101,6 +104,42 @@ class Donation < ActiveRecord::Base def being_marked_as_paid? status_changed? && status_was == 'unpaid' end + + def keep_under_user_limit + #max_donation_amount(user) - + #debugger + if self.amount > self.pitch.max_donation_amount(user) - self.pitch.total_amount_allocated_by_user(user) + if self.id # updating + self.amount = pitch.max_donation_amount(user) - pitch.donations.by_user(user).other_than(self).map(&:amount).sum + + pitch.credit_pitches.by_user(user).other_than(self).map(&:amount).sum + else # creating + self.amount = pitch.max_donation_amount(user) - pitch.donations.by_user(user).map(&:amount).sum + + pitch.credit_pitches.by_user(user).map(&:amount).sum + end + end + end + + def limit_to_existing_donation + #debugger + existing_donation = pitch.donations.unpaid.by_user(user).map(&:amount).sum #Donation.unpaid.find(:all, :conditions => "pitch_id = #{pitch.id} and user_id = #{user.id}").map(&:amount).sum + if existing_donation > 0 + self.amount = existing_donation + end + end + + def check_credit + #debugger + # limit if not an org and the amount is greater than the pitch/user's remaining limit (under 20% of pitch total) + if !user.organization? + keep_under_user_limit #self.pitch.max_donation_amount(user) - self.pitch.total_amount_allocated_by_user(user) + end + + limit_to_existing_donation + # limit if amount is greater than the remaining funding sought for pitch + if self.amount > pitch.requested_amount - pitch.current_funding + self.amount = pitch.requested_amount - pitch.current_funding + end + end def check_donation if pitch.fully_funded? @@ -108,9 +147,12 @@ class Donation < ActiveRecord::Base return end - #TODO: convert user_can_donate_more? to use BigDecimal and pass in amount - unless pitch.user_can_donate_more?(user, amount) + if donation_type == "credit" + check_credit + end + unless pitch.user_can_donate_more?(user, self.amount) errors.add_to_base("Thanks for your support but we only allow donations of 20% of requested amount from one user. Please lower your donation amount and try again.") + return end end @@ -129,5 +171,14 @@ class Donation < ActiveRecord::Base paypal_params.delete(spotus_keys.first) end end + + def self.has_enough_credits?(credit_pitch_amounts, user) + credit_total = 0 + credit_pitch_amounts.values.each do |val| + credit_total += val["amount"].to_f + end + return true if credit_total <= user.total_credits + return false + end end app/models/donation.rb @@ -81,7 +81,7 @@ class Pitch < NewsItem has_many :tips, :through => :affiliations has_many :organization_pitches, :foreign_key => :pitch_id has_many :supporting_organizations, :through => :organization_pitches, :source => :organization - has_many :donations, :dependent => :destroy do + has_many :donations, :conditions => {:donation_type => "payment"}, :dependent => :destroy do def for_user(user) find_all_by_user_id(user.id) end @@ -90,11 +90,22 @@ class Pitch < NewsItem for_user(user).map(&:amount).sum end end + + has_many :credit_pitches, :class_name => "Donation", :conditions => {:donation_type => "credit"}, :dependent => :destroy do + def for_user(user) + find_all_by_user_id(user.id) + end + + def total_amount_for_user(user) + for_user(user).map(&:amount).sum + end + end + has_many :donations_and_credits, :class_name => "Donation" has_many :organizational_donors, :through => :donations, :source => :user, :order => "donations.created_at", :conditions => "users.type = 'organization'", :uniq => true - has_many :supporters, :through => :donations, :source => :user, :order => "donations.created_at", :uniq => true + has_many :supporters, :through => :donations_and_credits, :source => :user, :order => "donations.created_at", :uniq => true has_many :blog_subscribers, :through => :donations, :source => :user, :conditions => "users.notify_blog_posts = 1", :order => "donations.created_at", :uniq => true has_many :posts, :order => "created_at desc", :dependent => :destroy do @@ -252,7 +263,11 @@ class Pitch < NewsItem end def total_amount_donated - donations.paid.map(&:amount).sum + donations.paid.map(&:amount).sum + credit_pitches.paid.map(&:amount).sum + end + + def total_amount_allocated_by_user(user) + donations.by_user(user).map(&:amount).sum + credit_pitches.by_user(user).map(&:amount).sum end def donated_to? @@ -279,8 +294,10 @@ class Pitch < NewsItem return false if attempted_donation_amount.nil? return true if user.organization? && attempted_donation_amount <= requested_amount return false if attempted_donation_amount > funding_needed - user_donations = donations.paid.total_amount_for_user(user) + user_donations = donations.paid.total_amount_for_user(user) + credit_pitches.paid.total_amount_for_user(user) + #user_donations = donations.total_amount_for_user(user) + credit_pitches.total_amount_for_user(user) (user_donations + attempted_donation_amount) <= max_donation_amount(user) + #user_donations <= max_donation_amount(user) end def dispatch_fact_checker app/models/pitch.rb @@ -27,7 +27,7 @@ class Purchase < ActiveRecord::Base cattr_accessor :gateway - after_create :associate_donations, :apply_credit_pitches, :associate_spotus_donations + after_create :associate_donations, :associate_spotus_donations, :associate_credits before_create :bill_credit_card, :unless => lambda {|p| p.paypal_transaction? } before_validation_on_create :build_credit_card, :set_credit_card_number_ending, :unless => lambda {|p| p.paypal_transaction? } @@ -42,7 +42,8 @@ class Purchase < ActiveRecord::Base validate :validate_credit_card, :on => :create, :unless => lambda {|p| p.credit_covers_total? || p.paypal_transaction? } belongs_to :user - has_many :donations + has_many :donations, :conditions => {:donation_type => "payment"} + has_many :credit_pitches, :class_name => "Donation", :conditions => {:donation_type => "credit"} has_one :spotus_donation def credit_covers_total? @@ -60,6 +61,10 @@ class Purchase < ActiveRecord::Base def donations=(donations) @new_donations = donations end + + def credit_pitches=(credit_pitches) + @new_credit_pitches = credit_pitches + end def total_amount return self[:total_amount] unless self[:total_amount].blank? @@ -85,10 +90,6 @@ class Purchase < ActiveRecord::Base self[:total_amount] = total_amount end - def apply_credit_pitches - self.user.apply_credit_pitches - end - def build_credit_card @credit_card = ActiveMerchant::Billing::CreditCard.new(credit_card_hash) end @@ -107,6 +108,20 @@ class Purchase < ActiveRecord::Base (@new_donations || []).each do |donation| donation.purchase = self donation.pay! + + end + end + + def associate_credits + transaction do + credit_pitch_ids = user.credit_pitches.unpaid.map{|credit_pitch| [credit_pitch.pitch.id]}.join(", ") + credit = Credit.create(:user => user, :description => "Applied to Pitches (#{credit_pitch_ids})", + :amount => (0 - user.allocated_credits)) + user.credit_pitches.unpaid.each do |credit_pitch| + credit_pitch.credit_id = credit.id + credit_pitch.status = "deducted" + credit_pitch.save(false) + end end end app/models/purchase.rb @@ -54,7 +54,6 @@ class Tip < NewsItem named_scope :most_pledged, :order => "(select sum(amount) from pledges where pledges.tip_id = #{table_name}.id) DESC" - def self.createable_by?(user) !user.nil? end app/models/tip.rb @@ -68,11 +68,19 @@ class User < ActiveRecord::Base belongs_to :category - has_many :donations do + has_many :donations, :conditions => {:donation_type => "payment"} do def pitch_sum(pitch) self.paid.all(:conditions => {:pitch_id => pitch}).map(&:amount).sum end end + + has_many :credit_pitches, :class_name => "Donation", :conditions => {:donation_type => "credit"} do + def pitch_sum(pitch) + self.paid.all(:conditions => {:pitch_id => pitch}).map(&:amount).sum + end + end + + has_many :all_donations, :class_name => "Donation" has_many :spotus_donations has_many :tips @@ -82,7 +90,7 @@ class User < ActiveRecord::Base has_many :jobs has_many :samples has_many :credits - has_many :credit_pitches + has_many :comments has_many :contributor_applications has_many :pledges do @@ -193,16 +201,15 @@ class User < ActiveRecord::Base def apply_credit_pitches #refactor - there must be a nicer ruby-like way to do this + transaction do - credit_pitch_ids = self.credit_pitches.map{|credit_pitch| [credit_pitch.id]}.join(", ") - credit = Credit.create(:user => self, :description => "Applied to Pitches (#{credit_pitch_ids})", - :amount => (0 - self.allocated_credits)) - self.credit_pitches.each do |credit_pitch| - credit_pitch.status = "paid" - credit_pitch.paid_credit_id = credit.id - credit_pitch.update_pitch_funding - credit_pitch.save - end + credit_pitch_ids = self.credit_pitches.unpaid.map{|credit_pitch| [credit_pitch.pitch.id]}.join(", ") + credit = Credit.create(:user => self, :description => "Applied to Pitches (#{credit_pitch_ids})", + :amount => (0 - self.allocated_credits)) + self.credit_pitches.unpaid.each do |credit_pitch| + credit_pitch.credit_id = credit.id + credit_pitch.pay! + end end end @@ -255,7 +262,7 @@ class User < ActiveRecord::Base end def amount_donated_to(pitch) - self.donations.pitch_sum(pitch) + self.donations.pitch_sum(pitch) + self.credit_pitches.pitch_sum(pitch) end # Encrypts the password with the user salt app/models/user.rb @@ -1,4 +1,8 @@ -- form_for CreditPitch.new(:pitch => news_item, :amount => current_user.remaining_credits), :url => myspot_credit_pitches_path, :html => {:id => "new_credit_pitch_#{news_item.id}", :class => "auth"} do |f| +- form_for Donation.new(:pitch => news_item, :amount => current_user.remaining_credits, :donation_type => "credit"), :url => myspot_donations_path, :html => {:id => "new_credit_pitch_#{news_item.id}", :class => "auth"} do |f| = f.hidden_field :amount, :id => "credit_pitch_amount" = f.hidden_field :pitch_id - = image_submit_tag "apply_credits.png", :alt => "Apply credits", :title => "Apply credits" \ No newline at end of file + = f.hidden_field :user_id, :value => current_user.id + = f.hidden_field :donation_type, :value => "credit" + = image_submit_tag "apply_credits.png", :alt => "Apply credits", :title => "Apply credits" +.double_content_border += render :partial => "shared/progress_bar", :locals => {:pitch => news_item} \ No newline at end of file app/views/credits/_credit_pitch.html.haml @@ -1,9 +1,9 @@ - case - - when news_item.fully_funded? + - when news_item.fully_funded? = render :partial => 'donations/fully_funded' - - when current_user && current_user.remaining_credits > 0 + - when current_user && (current_user.remaining_credits > 0) && (news_item.total_amount_allocated_by_user(current_user) < current_user.max_donation_for(news_item)) = render :partial => 'credits/credit_pitch', :locals => {:news_item => news_item} - - when current_user && !current_user.can_donate_to?(news_item) + - when current_user && !current_user.can_donate_to?(news_item) || (news_item.total_amount_allocated_by_user(current_user) >= current_user.max_donation_for(news_item)) = render :partial => 'donations/can_not_donate', :locals => {:news_item => news_item} - when news_item.funding_needed < Donation::DEFAULT_AMOUNT || (current_user && current_user.max_donation_for(news_item) < Donation::DEFAULT_AMOUNT) = render :partial => 'donations/donate_variable_amount', :locals => {:news_item => news_item} app/views/donations/_button.html.haml @@ -1,7 +1,7 @@ - # dashboard navigation #dashboard_tab_container %ul.dashboard_navigation - %li= link_to "My Donations (#{current_user.donations.paid.count})", myspot_donations_path, :id => "dashboard_donations_tab" + %li= link_to "My Donations (#{current_user.all_donations.paid.count})", myspot_donations_path, :id => "dashboard_donations_tab" %li= link_to "My Pledges (#{current_user.pledges.count})", myspot_pledges_path, :id => "dashboard_pledges_tab" %li= link_to "My Pitches (#{current_user.pitches.count})", myspot_pitches_path, :id => "dashboard_pitches_tab" %li= link_to "My Blog Posts (#{current_user.posts.count})", myspot_posts_path, :id => "dashboard_posts_tab" app/views/myspot/_dashboard_nav.html.haml @@ -55,12 +55,12 @@ = text_field_tag "donation_amounts[#{donation.id}][amount]", number_to_currency(donation.amount, :delimiter => '', :unit => ''), :size => 4, :id => "donation_amounts_#{donation.id}_amount" .action= link_to "Remove", myspot_donation_path(donation), :method => :delete, :confirm => "Are you sure you'd like to remove this donation of #{number_to_currency(donation.amount)}?" %hr - - if current_user.credit_pitches.unpaid.any? + - if unpaid_credits.any? %h3 Apply Credits %ul.unpaid_donations %hr - - current_user.credit_pitches.unpaid.each do |credit_pitch| + - unpaid_credits.each do |credit_pitch| - content_tag_for :li, credit_pitch, :class => 'unpaid' do .column.span-70 = link_to image_tag(credit_pitch.pitch.featured_image.url(:thumb)), credit_pitch.pitch @@ -74,7 +74,7 @@ .column.span-95 $ = text_field_tag "credit_pitch_amounts[#{credit_pitch.id}][amount]", number_to_currency(credit_pitch.amount, :delimiter => '', :unit => ''), :size => 4, :id => "credit_pitch_amounts_#{credit_pitch.id}_amount" - .action= link_to "Remove", myspot_credit_pitch_path(credit_pitch), :method => :delete, :confirm => "Are you sure you'd like to remove this credit of #{number_to_currency(credit_pitch.amount)}?" + .action= link_to "Remove", myspot_donation_path(credit_pitch), :method => :delete, :confirm => "Are you sure you'd like to remove this credit of #{number_to_currency(credit_pitch.amount)}?" %hr %li#support_spotus %h3 Support Spot.Us @@ -90,7 +90,7 @@ = text_field_tag "spotus_donation_amount", number_to_currency(spotus_donation.amount, :unit => ''), :size => 5, :id => "spotus_donation" .action= link_to "Remove", '#', :id => 'remove_spotus_donation' .float-right - = image_submit_tag 'update.png', :alt => 'Update', :name =>"submit", :value => "update" + =# image_submit_tag 'update.png', :alt => 'Update', :name =>"submit", :value => "update" = image_submit_tag 'purchase.png', :alt => 'Purchase', :name =>"submit", :value => "purchase" .double_content_border app/views/myspot/donation_amounts/edit.html.haml app/models/credit_pitch.rb spec/controllers/myspot/credit_pitches_controller_spec.rb 6baccf536283468d08d0b168766f5379d86788bc e5bff778f772d2bdeae48c61970081f278969f37 Dan Newman dpnewman@gmail.com http://github.com/spot-us/spot-us/commit/b5a3ea73bffee8aca654a3901ed9ed6f340d1bea b5a3ea73bffee8aca654a3901ed9ed6f340d1bea 2009-10-27T10:14:55-07:00 2009-10-27T10:14:55-07:00 merged with master 5da0078bcd2d59da5d40b3e570c24a1106212b93 Dan Newman dpnewman@gmail.com