app/controllers/events_controller.rb in artfully_ose-1.2.0.pre.4 vs app/controllers/events_controller.rb in artfully_ose-1.2.0.pre.5

@@ -21,11 +21,11 @@
     end
   end
 
   def index
     authorize! :view, Event
-    @events = current_organization.events.includes(:shows, :venue).order('updated_at DESC')
+    @events = current_organization.events.includes(:shows, :tickets).order('updated_at DESC')
   end
 
   def show
     authorize! :view, @event
     @shows = @event.shows.paginate(:page => params[:page], :per_page => 25)
@@ -50,11 +50,11 @@
   end
 
   def edit
     authorize! :edit, @event
   end
-  
+
   def image
     authorize! :edit, @event
   end
 
   def assign
@@ -101,31 +101,13 @@
   def storefront_link
   end
 
   def wp_plugin
   end
-  
+
   def prices
   end
 
-  def temp_discounts_index
-    find_event
-  end
-
-  def temp_discount_form
-    find_event
-
-    @discount = TempDiscount.new
-    @discount.promotion_type = 'two-for-one'
-
-    @event.charts.collect(&:sections).flatten.each do |section|
-      @discount.discount_sections.new(
-        :section => section,
-        :price => section.price
-      )
-    end
-  end
-  
   def messages
   end
 
   def resell
     @organization = current_organization