@@ -8,6 +8,7 @@ Wed, Nov 4, 2009 --------------------------------------------------------------------- - Correctly set opportunity campaign and source when converting a lead (LH #119). - Show correct campaign name and source when adding a lead from campaign landing page. +- Update lead counters when reassigning leads between campaigns (LH #117). Sat, Oct 31, 2009 --------------------------------------------------------------------- CHANGELOG @@ -117,6 +117,7 @@ class LeadsController < ApplicationController #---------------------------------------------------------------------------- def update @lead = Lead.my(@current_user).find(params[:id]) + @campaign = @lead.campaign.dup if @lead.campaign && !called_from_index_page? respond_to do |format| if @lead.update_with_permissions(params[:lead], params[:users]) app/controllers/leads_controller.rb @@ -100,6 +100,19 @@ class Lead < ActiveRecord::Base end end + # Update lead attributes taking care of campaign lead counters when necessary. + #---------------------------------------------------------------------------- + def update_with_permissions(attributes, users) + if self.campaign_id == attributes[:campaign_id] # Same campaign (if any). + super(attributes, users) # See lib/fat_free_crm/permissions.rb + else # Campaign has been changed -- update lead counters... + decrement_leads_count # ..for the old campaign... + lead = super(attributes, users) # Assign new campaign. + increment_leads_count # ...and now for the new campaign. + lead + end + end + # Promote the lead by creating contact and optional opportunity. Upon # successful promotion Lead status gets set to :converted. #---------------------------------------------------------------------------- app/models/lead.rb @@ -2,11 +2,6 @@ - collapsed = session[:lead_status].nil? # && @lead.errors.empty? = subtitle :lead_status, collapsed -- logger.i @lead.campaign -- logger.i @lead.source -- logger.i @campaign -- logger.i called_from_landing_page?("campaigns") - .section %small#lead_status_intro{ hidden_if(!collapsed) } = "You can add lead status information later." unless edit app/views/leads/_status.html.haml @@ -10,6 +10,9 @@ if @lead.errors.empty? page[id].visual_effect :highlight, :duration => 1.0 if called_from_index_page? page << refresh_sidebar(:index, :filters) + elsif @campaign # Lead updated on Campaign landing page: refresh Campaign summary. + @campaign.reload + page << refresh_sidebar_for(:campaigns, :show, :summary) else page[:recently].replace :partial => "common/recently" end app/views/leads/update.js.rjs @@ -358,9 +358,9 @@ describe LeadsController do describe "with valid params" do it "should update the requested lead, expose it as @lead, and render [update] template" do - @lead = Factory(:lead, :id => 42, :first_name => "Billy", :user => @current_user) + @lead = Factory(:lead, :first_name => "Billy", :user => @current_user) - xhr :put, :update, :id => 42, :lead => { :first_name => "Bones" } + xhr :put, :update, :id => @lead.id, :lead => { :first_name => "Bones" } @lead.reload.first_name.should == "Bones" assigns[:lead].should == @lead assigns[:lead_status_total].should == nil @@ -368,26 +368,56 @@ describe LeadsController do end it "should update lead status" do - @lead = Factory(:lead, :id => 42, :status => "new", :user => @current_user) + @lead = Factory(:lead, :status => "new", :user => @current_user) - xhr :put, :update, :id => 42, :lead => { :status => "rejected" } + xhr :put, :update, :id => @lead.id, :lead => { :status => "rejected" } @lead.reload.status.should == "rejected" end it "should update lead source" do - @lead = Factory(:lead, :id => 42, :source => "campaign", :user => @current_user) + @lead = Factory(:lead, :source => "campaign", :user => @current_user) - xhr :put, :update, :id => 42, :lead => { :source => "cald_call" } + xhr :put, :update, :id => @lead.id, :lead => { :source => "cald_call" } @lead.reload.source.should == "cald_call" end it "should update lead campaign" do - old_campaign = Factory(:campaign) - new_campaign = Factory(:campaign) - @lead = Factory(:lead, :id => 42, :campaign => old_campaign, :user => @current_user) + @campaigns = { :old => Factory(:campaign), :new => Factory(:campaign) } + @lead = Factory(:lead, :campaign => @campaigns[:old]) - xhr :put, :update, :id => 42, :lead => { :campaign_id => new_campaign.id } - @lead.reload.campaign.should == new_campaign + xhr :put, :update, :id => @lead.id, :lead => { :campaign_id => @campaigns[:new].id } + @lead.reload.campaign.should == @campaigns[:new] + end + + it "should decrement campaign leads count if campaign has been removed" do + @campaign = Factory(:campaign) + @lead = Factory(:lead, :campaign => @campaign) + @count = @campaign.reload.leads_count + + xhr :put, :update, :id => @lead, :lead => { :campaign_id => nil } + @lead.reload.campaign.should == nil + @campaign.reload.leads_count.should == @count - 1 + end + + it "should increment campaign leads count if campaign has been assigned" do + @campaign = Factory(:campaign) + @lead = Factory(:lead, :campaign => nil) + @count = @campaign.leads_count + + xhr :put, :update, :id => @lead, :lead => { :campaign_id => @campaign.id } + @lead.reload.campaign.should == @campaign + @campaign.reload.leads_count.should == @count + 1 + end + + it "should update both campaign leads counts if reassigned to a new campaign" do + @campaigns = { :old => Factory(:campaign), :new => Factory(:campaign) } + @lead = Factory(:lead, :campaign => @campaigns[:old]) + @counts = { :old => @campaigns[:old].reload.leads_count, :new => @campaigns[:new].leads_count } + + xhr :put, :update, :id => @lead, :lead => { :campaign_id => @campaigns[:new].id } + @lead.reload.campaign.should == @campaigns[:new] + @campaigns[:old].reload.leads_count.should == @counts[:old] - 1 + @campaigns[:new].reload.leads_count.should == @counts[:new] + 1 end it "should update shared permissions for the campaign" do @@ -400,14 +430,23 @@ describe LeadsController do end it "should get the data for leads sidebar when called from leads index" do - @lead = Factory(:lead, :id => 42, :user => @current_user) + @lead = Factory(:lead) request.env["HTTP_REFERER"] = "http://localhost/leads" - xhr :put, :update, :id => 42, :lead => { :first_name => "Billy" } + xhr :put, :update, :id => @lead.id, :lead => { :first_name => "Billy" } assigns[:lead_status_total].should_not be_nil assigns[:lead_status_total].should be_an_instance_of(Hash) end + it "should reload lead campaign if called from campaign landing page" do + @campaign = Factory(:campaign) + @lead = Factory(:lead, :campaign => @campaign) + + request.env["HTTP_REFERER"] = "http://localhost/campaigns/#{@campaign.id}" + xhr :put, :update, :id => @lead, :lead => { :first_name => "Hello" } + assigns[:campaign].should == @campaign + end + describe "lead got deleted or otherwise unavailable" do it "should reload current page with the flash message if the lead got deleted" do @lead = Factory(:lead, :user => @current_user).destroy spec/controllers/leads_controller_spec.rb @@ -68,6 +68,17 @@ describe "/leads/update.js.rjs" do response.should include_text(%Q/$("lead_#{@lead.id}").visualEffect("highlight"/) end + it "should update related asset sidebar from related asset" do + assigns[:campaign] = campaign = Factory(:campaign) + request.env["HTTP_REFERER"] = "http://localhost/campaigns/#{campaign.id}" + render "leads/create.js.rjs" + + response.should have_rjs("sidebar") do |rjs| + with_tag("div[class=panel][id=summary]") + with_tag("div[class=panel][id=recently]") + end + end + it "should update recently viewed items" do render "leads/update.js.rjs" response.should have_rjs("recently") do |rjs| spec/views/leads/update.rjs_spec.rb 57befbcb467261b84b9fbe5780516a14726ecd07 Mike Dvorkin mike@dvorkin.net http://github.com/michaeldv/fat_free_crm/commit/90ba3e77774ed912be109384daf0cb1039fe9ceb 90ba3e77774ed912be109384daf0cb1039fe9ceb 2009-11-04T20:04:20-08:00 2009-11-04T20:04:20-08:00 Update lead counters when reassigning leads between campaigns [#117 state:resolved] ad9600ff29367a5ee965f95a298d66cf393ef41e Mike Dvorkin mike@dvorkin.net