Skip to content

Instantly share code, notes, and snippets.

@DanBradbury
Created October 23, 2014 16:35
Show Gist options
  • Save DanBradbury/68cd77ff52ee4c169c68 to your computer and use it in GitHub Desktop.
Save DanBradbury/68cd77ff52ee4c169c68 to your computer and use it in GitHub Desktop.
diff --git a/app/controllers/networks_controller.rb b/app/controllers/networks_controller.rb
index 47582da..2f37495 100644
--- a/app/controllers/networks_controller.rb
+++ b/app/controllers/networks_controller.rb
@@ -588,7 +588,7 @@ def advertiser_campaigns_columns tab
r.column :stats_call_count_yesterday, :friendly_name => "<div class='align_center'>Calls<br />Yesterday</div>"
end

- if tab.in?( [:AllButArchived, :Suspended] )
+ if tab.in?( [:AllButArchived, :Suspended, :Paused] )
r.column :stats_call_count, :friendly_name => "<div class='align_center'>Calls<br />MTD</div>"
r.column :stats_sum_advertiser_payin, :friendly_name => "<div class='align_center'><br />#{current_network.currency_symbol} MTD</div>", :sortDir => "DESC"
r.column :stats_conversion_rate, :friendly_name => "<div class='align_center'>Conv. Rate<br />MTD</div>", :renderer => 'conversion_rate_renderer'
@@ -640,7 +640,7 @@ def advertiser_campaigns_columns tab
r.column :budget, :friendly_name => "<br />Budget", :sortable => false, :record_expression => lambda { |ac| b = ac.budget_activities.find_by_alert_name( "commission_budget_terms" ); ( b._?.as_json_for_graphing || {} ).merge( :edit_link => url_for(:controller => :advertiser_campaigns, :action => ac.pricing_step, :id => ac.id, :only_path => true, :show_alerts => 1) ) }, :renderer => "budget_alert_renderer"
r.column :call_cap, :friendly_name => "<br />Call Cap", :sortable => false, :record_expression => lambda { |ac| b = ac.budget_activities.find_by_alert_name( "call_count_budget_terms" ); ( b._?.as_json_for_graphing || {} ).merge( :edit_link => url_for(:controller => :advertiser_campaigns, :action => ac.pricing_step, :id => ac.id, :only_path => true, :show_alerts => 1) ) }, :renderer => "budget_alert_renderer"
end
- if tab.in?( [:Live,:Suspended] )
+ if tab.in?( [:Live,:Suspended, :Paused] )
r.column :actions, :friendly_name => "Additional<br/>Actions", :record_expression => lambda { |ac|
actions = []
actions << { :text => "forwarding", :link => url_for( :controller => 'advertiser_campaigns', :action => 'transfer_settings', :id => ac.id ) }
diff --git a/app/views/networks/advertiser_campaigns.html.erb b/app/views/networks/advertiser_campaigns.html.erb
index a88303c..519ae6d 100644
--- a/app/views/networks/advertiser_campaigns.html.erb
+++ b/app/views/networks/advertiser_campaigns.html.erb
@@ -65,7 +65,8 @@ function on_store_load( store_name )
grids = [ [:Pending, { :title => "Pending" }],
[:Live, { :title => "Live" }],
[:Suspended, { :title => "Suspended" }],
- [:Archived, { :title => "Archived / Expired" } ] ]
+ [:Expired, { :title => "Archived" } ],
+ [:Paused, { :title => "Paused" } ] ]
%>

<% render_bread_crumbs( [ ["Network Home", { :controller => :networks, :action => :show, :id => current_network.id } ],
@@ -92,4 +93,4 @@ grids = [ [:Pending, { :title => "Pending" }],
:defer_render => true,
:enable_tooltips => true
%>
-<% end %>
\ No newline at end of file
+<% end %>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment