Display newly created opportunity when converting lead from campaign page

[fatfreecrm#121 state:open]

Author: Mike Dvorkin

CHANGELOG

@@ -8,7 +8,8 @@ Fri, Nov 6, 2009
 ---------------------------------------------------------------------
 - Adjust total campaign revenue when related opportunity is won (LH #121).
 - Refresh campaign sidebar when updating related opportunity (LH #121).
-- Update campaign summary when rejecting or converting related lead (LH #121).
+- Refresh campaign sidebar when rejecting or converting related lead (LH #121).
+- Display newly created opportunity when converting lead from campaign page (LH #121).
 
 Thu, Nov 5, 2009
 ---------------------------------------------------------------------

app/controllers/leads_controller.rb

@@ -178,6 +178,7 @@ def promote
     @users = User.except(@current_user).all
     @account, @opportunity, @contact = @lead.promote(params)
     @accounts = Account.my(@current_user).all(:order => "name")
+    @stage = Setting.as_hash(:opportunity_stage)
 
     respond_to do |format|
       if @account.errors.empty? && @opportunity.errors.empty? && @contact.errors.empty?

app/models/activity_observer.rb

@@ -24,7 +24,7 @@ class ActivityObserver < ActiveRecord::Observer
   def after_create(subject)
     log_activity(subject, :created)
     if subject.is_a?(Opportunity) && subject.campaign && subject.stage == "won"
-      update_campaign_revenue(subject.campaign, subject.amount - subject.discount)
+      update_campaign_revenue(subject.campaign, (subject.amount || 0) - (subject.discount || 0))
     end
   end
 

app/views/leads/promote.js.rjs

@@ -12,6 +12,9 @@ if @lead.status == "converted"
       page << refresh_sidebar(:index, :filters)
     elsif called_from_landing_page?("campaigns")
       page << refresh_sidebar_for(:campaigns, :show, :summary)
+      if @opportunity
+        page.insert_html :top, :opportunities, :partial => "opportunities/opportunity", :collection => [ @opportunity ]
+      end
     else
       page[:recently].replace :partial => "common/recently"
     end

spec/controllers/leads_controller_spec.rb

@@ -688,6 +688,7 @@ def get_data_for_sidebar
       assigns[:accounts].should == [ @account ]
       assigns[:opportunity].should == @opportunity
       assigns[:contact].should == @contact
+      assigns[:stage].should be_instance_of(Hash)
       response.should render_template("leads/promote")
     end
 

spec/views/leads/promote.rjs_spec.rb

@@ -63,9 +63,12 @@
       end
     end
 
-    describe "from related asset page -" do
+    describe "from related campaign page -" do
       before(:each) do
         request.env["HTTP_REFERER"] = "http://localhost/campaigns/123"
+        assigns[:campaign] = Factory(:campaign)
+        assigns[:stage] = {}
+        assigns[:opportunity] = @opportunity = Factory(:opportunity)
       end
 
       it "should replace [Convert Lead] with lead partial and highligh it" do
@@ -77,7 +80,6 @@
       end
 
       it "should update campaign sidebar" do
-        assigns[:campaign] = campaign = Factory(:campaign)
         render "leads/promote.js.rjs"
 
         response.should have_rjs("sidebar") do |rjs|
@@ -86,6 +88,14 @@
         end
       end
 
+      it "should insert new opportunity if any" do
+        render "leads/promote.js.rjs"
+
+        response.should have_rjs(:insert, :top) do |rjs|
+          with_tag("li[id=opportunity_#{@opportunity.id}]")
+        end
+      end
+
     end
   end # no errors