app/controllers/slices_controller.rb in artfully_ose-1.2.0.beta.1 vs app/controllers/slices_controller.rb in artfully_ose-1.2.0.pre
- old
+ new
@@ -6,12 +6,11 @@
["", ""],
["Location", "order_location_proc"],
["Payment Method", "payment_method_proc"],
["Ticket Type", "ticket_type_proc"],
["Discount", "discount_code_proc"],
- ["First time/Repeat", "first_time_buyer_proc"],
- ["Validated", "validated_proc"]
+ ["First time/Repeat", "first_time_buyer_proc"]
]
end
#
# TODO TODO TODO
@@ -31,8 +30,8 @@
def load_statement
@show = Show.includes(:event, :tickets => [:items => :order]).find(params[:statement_id])
@total_tickets = @show.tickets.select{|t| t.sold?}.size + @show.tickets.select{|t| t.comped?}.size
authorize! :view, @show.event
- @items = Item.includes({:product => :ticket_type}, :discount, :order, :show => :event).where(:show_id => params[:statement_id])
+ @items = Item.includes(:product, :order, :show => :event).where(:show_id => params[:statement_id])
end
end
\ No newline at end of file