artfully_ose 1.2.0.alpha.2 → 1.2.0.beta.1

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    NTZhNzA2MTY4YzkyODhmMDIzZDhiZGQ4ZDhlMzE5Yjk1YWZhNDBkOA==
+    NzdkN2Y3NDg3MDVhMDY5NjQ4OWM1MzlhYjlmNGFkMTI1YThlM2EzYQ==
   data.tar.gz: !binary |-
-    OGYyZThlYTUwMzBlNDM3MmNkZGE2OGRiYzM0NTAyMjc0YjA3NGJhNw==
+    NzhhODQxYjMzYTFjMDI5M2RkNzZiMzg3YzYyYTVmYTc1NjcyMjgzOQ==
 SHA512:
   metadata.gz: !binary |-
-    ZDNlMDZiMmJjNGYxNGUwYWNhOWZiZjJiYzFiMGYxYTE0MTQ0OGU1NTA2ZDgz
-    YTIxOTYxMTg3N2UwMzQ1YjhkYTVkNTA4Mjg4NGQ4ZWRmZDc1MDQ4ODQyZmJi
-    YmNmMTgyMmI1MWRhNzhmZWVmMzM3YTYwNDExMzU0NzBiOWMxMzA=
+    ZThmZDFjY2RlMWQ2MGExYzlkODYyYWE2MmQ3OWY1NDYyNjk5MDIzOTQ1MDhl
+    NTkzN2Q0NGJhOGJiNDE4ODBhODJkODczNzZmMWE5OTVmMGUzYzVlZDhiMzI3
+    ZGQ3NGI4NmJiZWUzODFiM2IzYzUzNzU5NGQ3OGE2OGNmN2YyMTg=
   data.tar.gz: !binary |-
-    ZTRjM2Q4ZGY0YzdhYmFkYmYzNTU1MDE2Zjc1YTEzMjQ3NDRmMmZkMjRjYmEy
-    OTIxZDA1N2M4MDMxODY3N2QzYjA2YjA1OGE3ZmM3ZWI5MzRhYWQ0MGM2ZDhh
-    NjE4ZTAzZTZlMDRiNWYxZjMwYmU2NTY0NGU2ZGIwZDM1MjQ1NTA=
+    MzU1N2U3MzgzODQ2MzZmOTc2MjU4YjBjYzc2MzBjMzQ0YWU2NDExMjcxZTNk
+    ZmJjNzBjM2JiMzVkMDUxNzM5MzZlZjBjZGI2NTZjZmVhYjEyNDdiMDkzNWVm
+    NWUzNTE4MWUxZTk0NzgwMGFhYzRjNGE2OGFmODRkMjU1ZGNkNGI=

data/app/assets/stylesheets/application.sass

@@ -119,8 +119,14 @@ ul#memberships
   #text
     padding-top: 50px
 
-#add-a-pass-type
+#no-pass-sales
   text-align: center
+  width: 100%
+  height: 100px
+  #text
+    padding-top: 25px
+
+#add-a-pass-type
   width: 75%
   height: 150px
   #text

data/app/concerns/itemable.rb

@@ -1,6 +1,6 @@
 #
 # Include this method on objects that can be used to create items using Item.for
-# Ticket class doesn't meed it because it defines its own sold_price method
+# Ticket class doesn't need it because it defines its own sold_price method
 #
 module Itemable
   extend ActiveSupport::Concern

data/app/concerns/pdf_generation.rb

@@ -17,17 +17,7 @@ class PdfGeneration
   end
 
   def generate
-    response = http_party.post(PDF_POST_URL, pdf_attributes)
-    json     = JSON.parse(response.body)
-
-    while !json["complete"]
-      response = http_party.get(status_url(json))
-      json     = JSON.parse(response.body)
-
-      sleeper.sleep 1 unless json["complete"]
-    end
-
-    download_url(json)
+    Wisepdf::Writer.new.to_pdf(content)
   end
 
   def content

data/app/concerns/search_by_dates.rb

@@ -0,0 +1,20 @@
+module SearchByDates
+  attr_reader :start, :stop
+  attr_reader :organization
+
+  def start_with(start)
+    start.present? ? DateTime.parse(start) : default_start
+  end
+
+  def stop_with(stop)
+    stop.present? ? Sundial.midnightish(@organization, stop) : default_stop
+  end
+
+  def default_start
+    DateTime.now.in_time_zone(@organization.time_zone).beginning_of_month
+  end
+
+  def default_stop
+    DateTime.now.in_time_zone(@organization.time_zone).end_of_day
+  end
+end

data/app/controllers/member_cards_controller.rb

@@ -4,9 +4,8 @@ class MemberCardsController < ArtfullyOseController
   before_filter :find_members
 
   def new
-    generator = MemberCardGenerator::BlanksUsaIdc6.new(@members)
-    generator.generate
-    redirect_to generator.download_url
+    pdf = MemberCardGenerator::BlanksUsaIdc6.new(@members).generate
+    send_data pdf, :filename => "member_cards.pdf", :type => "application/pdf", :disposition => "attachment"
   end
 
   private

data/app/controllers/orders_controller.rb

@@ -89,6 +89,48 @@ class OrdersController < ArtfullyOseController
     end
   end
 
+  def passes
+    authorize! :view, Order
+
+    @organization = current_organization
+    @pass_type  = PassType.find_by_id(params[:pass_type_id]) if params[:pass_type_id].present?
+    @pass_types = @organization.pass_types
+
+    request.format = :csv if params[:commit] == "Download"
+
+    search_terms = {
+      :start        => params[:start],
+      :stop         => params[:stop],
+      :organization => @organization,
+      :pass_type    => @pass_type
+    }
+
+    @search = PassSaleSearch.new(search_terms) do |results|
+      results.paginate(:page => params[:page], :per_page => 25)
+    end
+
+    respond_to do |format|
+      format.html
+      format.csv do
+        filename = "Artfully-Pass-Sales-Export-#{DateTime.now.strftime("%m-%d-%y")}.csv"
+        items = ItemView.where(:product_type => "Pass")
+                             .where('items_view.created_at > ? ', @search.start)
+                             .where('items_view.created_at < ?',  @search.stop)
+                             .where('items_view.organization_id = ?', current_organization)
+                             .order('items_view.created_at desc')
+        if @pass_type
+          items = items.joins(:item).
+            joins("INNER JOIN passes ON (items.product_type = #{::Item.sanitize('Pass')} AND items.product_id = passes.id)").
+            joins("INNER JOIN pass_types ON (pass_types.id = passes.pass_type_id)").
+            where(:pass_types => {:id => @pass_type}).
+            group('items_view.order_id')
+        end
+        csv_string = items.all.to_comma(:pass_sale)
+        send_data csv_string, :filename => filename, :type => "text/csv", :disposition => "attachment"
+      end
+    end
+  end
+
   def sales
     authorize! :view, Order
 

data/app/controllers/passes_reports_controller.rb

@@ -1,5 +1,25 @@
 class PassesReportsController < ArtfullyOseController
   def index
-    @pass_types = current_organization.pass_types.all
+    @start_date = params[:start_date]
+    @end_date = params[:end_date]
+    @organization = current_user.current_organization
+    @pass_types = @organization.pass_types
+    @pass_type = PassType.find(params[:pass_type]) if params[:pass_type].present?
+    @report = nil
+    @report = PassesReport.new(@organization, @pass_type, @start_date, @end_date)
+    @rows = @report.rows.paginate(:page => params[:page], :per_page => 100) unless @report.nil?
+
+    @options_for_select = @pass_types.collect{ |p| [p.name, p.id] }
+    @options_for_select.unshift [PassType::ALL_PASSES_STRING, nil]
+
+    respond_to do |format|
+      format.html
+
+      format.csv do
+        @filename = [ @report.header, ".csv" ].join
+        @csv_string = @report.rows.to_comma
+        send_data @csv_string, :filename => @filename, :type => "text/csv", :disposition => "attachment"
+      end
+    end
   end
 end

data/app/helpers/artfully_ose_helper.rb

@@ -252,6 +252,16 @@ module ArtfullyOseHelper
     select_tag membership_type_id, raw(options), :class => "span3"
   end
 
+  def select_pass_type_for_sales_search(pass_types, pass_type_id, default)
+    options =
+      [
+        content_tag(:option, " --- All Pass Types --- ", :value => ""),
+        options_from_collection_for_select(pass_types, :id, :name, default)
+      ].join
+
+    select_tag pass_type_id, raw(options), :class => "span3"
+  end
+
   def nav_dropdown(text, link='#')
     link_to ERB::Util.html_escape(text) + ' <b class="caret"></b>'.html_safe, link, :class => 'dropdown-toggle', 'data-toggle' => 'dropdown'
   end

data/app/models/database_views/item_view.rb

@@ -145,4 +145,45 @@ class ItemView < ActiveRecord::Base
     person("Do Not Email")    { |person| person.do_not_email }
     person("Do Not Call")     { |person| person.do_not_call }
   end
+
+  comma :pass_sale do
+    created_at_local_to_organization("Date of Purchase")
+
+    item('Pass Type') { |item| item.product.pass_type.name }
+    payment_method("Payment Method")
+    price("Price") { |cents| number_to_currency(cents.to_f/100) }
+    special_instructions("Special Instructions")
+    notes("Notes")
+
+    person("Email")           { |person| person.email }
+    person("Salutation")      { |person| person.salutation }
+    person("First Name")      { |person| person.first_name }
+    person("Middle Name")     { |person| person.middle_name }
+    person("Last Name")       { |person| person.last_name }
+    person("Suffix")          { |person| person.suffix }
+    person("Title")           { |person| person.title }
+    person("Type")            { |person| person.type }
+    person("Subtype")         { |person| person.subtype }
+    person("Company Name")    { |person| person.company_name }
+
+    person("Address 1")       { |person| person.address && person.address.address1 }
+    person("Address 2")       { |person| person.address && person.address.address2 }
+    person("City")            { |person| person.address && person.address.city }
+    person("State")           { |person| person.address && person.address.state }
+    person("Zip")             { |person| person.address && person.address.zip }
+    person("Country")         { |person| person.address && person.address.country }
+    person("Phone1 type")     { |person| person.phones[0] && person.phones[0].kind }
+    person("Phone1 number")   { |person| person.phones[0] && person.phones[0].number }
+    person("Phone2 type")     { |person| person.phones[1] && person.phones[1].kind }
+    person("Phone2 number")   { |person| person.phones[1] && person.phones[1].number }
+    person("Phone3 type")     { |person| person.phones[2] && person.phones[2].kind }
+    person("Phone3 number")   { |person| person.phones[2] && person.phones[2].number }
+    person("Website")         { |person| person.website }
+    person("Twitter Handle")  { |person| person.twitter_handle }
+    person("Facebook URL")    { |person| person.facebook_url }
+    person("Linked In Url")   { |person| person.linked_in_url }
+    person("Tags")            { |person| person.tags.join("|") }
+    person("Do Not Email")    { |person| person.do_not_email }
+    person("Do Not Call")     { |person| person.do_not_call }
+  end
 end

data/app/models/ext/integrations.rb

@@ -3,6 +3,10 @@ module Ext
     module Member
     end
 
+    module ServiceFee
+      SERVICE_FEE = 0
+    end
+
     module User
       def need_more_info?
         false

data/app/models/fee_strategy.rb

@@ -1,5 +1,51 @@
 class FeeStrategy
+  def ticket_fee
+    ARTFULLY_CONFIG[:ticket_fee] || 0
+  end
+
   def apply_to_cart(cart)
-    #noop
+    return if cart.is_a? BoxOffice::Cart
+
+    handle_tickets(cart)
+    handle_memberships(cart)
+    handle_passes(cart)
+  end
+
+  def handle_tickets(cart)
+    cart.tickets.each do |ticket|
+      if ticket.price > 0
+        ticket.service_fee = ticket_fee
+      elsif ticket.price == 0
+        ticket.service_fee = 0
+      end
+
+      if ticket.cart_price == 0 && waive_fee_for?(ticket)
+        ticket.service_fee = 0
+      end
+
+      ticket.save
+    end
+  end
+
+  def handle_memberships(cart)
+    cart.memberships.each do |membership|
+      membership.service_fee = membership.membership_type.hide_fee? ? 0 : (membership.cart_price || membership.price) * MembershipType::SERVICE_FEE
+      membership.save
+    end
+  end
+
+  def handle_passes(cart)
+    cart.passes.each do |pass|
+      pass.service_fee = pass.pass_type.hide_fee? ? 0 : pass.price * PassType::SERVICE_FEE
+      pass.save
+    end
+  end
+
+  def waive_fee_for?(ticket)
+    # 
+    # This match is too tightly coupled to discount. Also, horrible.
+    # Check needs to be made because cart_price == 0 && BOGO means fee is applied
+    #
+    (ticket.discount.try(:promotion_type) == "DollarsOffTickets") || ticket.pass.present?
   end
 end

data/app/models/item.rb

@@ -22,9 +22,10 @@ class Item < ActiveRecord::Base
   validates_presence_of :product_type, :price, :realized_price, :net
   validates_inclusion_of :product_type, :in => %( Ticket Donation Membership Pass)
 
-  scope :donation,    where(:product_type => 'Donation')
-  scope :membership,  where(:product_type => 'Membership')
-  scope :ticket,      where(:product_type => 'Ticket')
+  scope :donation,        where(:product_type => 'Donation')
+  scope :membership,      where(:product_type => 'Membership')
+  scope :ticket,          where(:product_type => 'Ticket')
+  scope :sold_or_comped,  where("state in ('purchased','comped','settled')")
 
   scope :imported, joins(:order).merge(Order.imported)
   scope :not_imported, joins(:order).merge(Order.not_imported)

data/app/models/job/order_processor.rb

@@ -85,9 +85,10 @@ class OrderProcessor < Struct.new(:order, :options)
   end
 
   def generate_pdf
-    pdf_generator = PdfGeneration.new(order)
-    download_url = pdf_generator.generate
-    order.pdf = URI.parse(download_url)
+    pdf = PdfGeneration.new(order).generate
+    file = Tempfile.new(["#{order.id}", '.pdf'])
+    file << pdf.force_encoding("UTF-8")
+    order.pdf = file
     order.save
   end
 end

data/app/models/member.rb

@@ -169,9 +169,10 @@ class Member < ActiveRecord::Base
   end
 
   def generate_pdf
-    pdf_generator = PdfGeneration.new(self)
-    download_url = pdf_generator.generate
-    self.pdf = URI.parse(download_url)
+    pdf = PdfGeneration.new(self).generate
+    file = Tempfile.new(["#{self.id}", '.pdf'])
+    file << pdf.force_encoding("UTF-8")
+    self.pdf = file
     self.save
   end
 

data/app/models/membership_sale_search.rb

@@ -1,7 +1,7 @@
 class MembershipSaleSearch
+  include SearchByDates
 
-  attr_reader :start, :stop
-  attr_reader :organization, :membership_type
+  attr_reader :membership_type
 
   def initialize(terms)
     @organization    = terms[:organization]
@@ -15,22 +15,4 @@ class MembershipSaleSearch
   def results
     @results ||= Order.membership_sale_search(self).select(&:has_membership?)
   end
-
-  private
-
-  def start_with(start)
-    start.present? ? DateTime.parse(start) : default_start
-  end
-
-  def stop_with(stop)
-    stop.present? ? Sundial.midnightish(@organization, stop) : default_stop
-  end
-
-  def default_start
-    DateTime.now.in_time_zone(@organization.time_zone).beginning_of_month
-  end
-
-  def default_stop
-    DateTime.now.in_time_zone(@organization.time_zone).end_of_day
-  end
 end

data/app/models/membership_type.rb

@@ -1,4 +1,5 @@
 class MembershipType < ActiveRecord::Base
+  include Ext::Integrations::ServiceFee
   extend ::ArtfullyOseHelper
   attr_accessible :name, :price, :fee, :number_of_shows, 
                   :plan, :on_sale, :description, :ends_at, 
@@ -20,8 +21,6 @@ class MembershipType < ActiveRecord::Base
   scope :sales_valid, where("sales_start_at < ? or sales_start_at is null", DateTime.now).where("sales_end_at > ? or sales_end_at is null", DateTime.now)
   scope :not_ended, where('ends_at > ?', DateTime.now)
 
-  SERVICE_FEE = 0.05
-
   comma do
     name
     description

data/app/models/order.rb

@@ -121,6 +121,10 @@ class Order < ActiveRecord::Base
   def discount_codes
     tickets.collect(&:discount).uniq.compact
   end
+
+  def pass_codes
+    tickets.collect(&:pass).uniq.compact
+  end
   
   def imported?
     !self.import_id.nil?
@@ -269,6 +273,23 @@ class Order < ActiveRecord::Base
     standard = standard.where("membership_types.id = ?", search.membership_type.id) if search.membership_type if search.membership_type
     standard.all
   end
+
+  def self.pass_sale_search(search)
+    standard = ::Order.
+      where("orders.type != ?", ::Reseller::Order.name).
+      joins(:items).
+      joins("INNER JOIN passes ON (items.product_type = #{::Item.sanitize('Pass')} AND items.product_id = passes.id)").
+      joins("INNER JOIN pass_types ON (pass_types.id = passes.pass_type_id)").
+      includes([:organization, :person]).
+      group('orders.id')
+
+
+    standard = standard.after(search.start) if search.start
+    standard = standard.before(search.stop) if search.stop
+    standard = standard.where('orders.organization_id = ?', search.organization.id) if search.organization
+    standard = standard.where("pass_types.id = ?", search.pass_type.id) if search.pass_type if search.pass_type
+    standard.all
+  end
   
   def has_single_donation?
     (donations.size == 1) && tickets.empty?
@@ -307,6 +328,14 @@ class Order < ActiveRecord::Base
     items.select(&:membership?).present?
   end
 
+  def has_pass?
+    items.select(&:pass?).present?
+  end
+
+  def items_that_used_pass
+    items.select{ |i| i.pass_id.present? }
+  end
+
   def sum_donations
     all_donations.collect{|item| item.total_price.to_i}.sum
   end

data/app/models/pass.rb

@@ -18,6 +18,7 @@ class Pass < ActiveRecord::Base
 
   scope :not_expired, lambda { |time = DateTime.now| where("#{Pass.table_name}.ends_at > ?", time) }
   scope :expired,     lambda { |time = DateTime.now| where("#{Pass.table_name}.ends_at < ?", time) }
+  scope :owned,       where('person_id is not null')
 
   def self.for(pass_type)
     new.tap do |pass|
@@ -30,7 +31,7 @@ class Pass < ActiveRecord::Base
       pass.starts_at        = pass_type.starts_at
       pass.ends_at          = pass_type.ends_at
     end
-  end  
+  end 
 
   def adjust_ends_at
     self.ends_at = self.ends_at.end_of_day unless self.ends_at.blank?

data/app/models/pass_sale_search.rb

@@ -0,0 +1,18 @@
+class PassSaleSearch
+  include SearchByDates
+
+  attr_reader :pass_type
+
+  def initialize(terms)
+    @organization    = terms[:organization]
+    @pass_type       = terms[:pass_type]
+    @start           = start_with(terms[:start])
+    @stop            = stop_with(terms[:stop])
+
+    @results = yield(results) if block_given?
+  end
+
+  def results
+    @results ||= Order.pass_sale_search(self).select(&:has_pass?)
+  end
+end

data/app/models/pass_type.rb

@@ -1,4 +1,5 @@
 class PassType < ActiveRecord::Base
+  include Ext::Integrations::ServiceFee
   include OhNoes::Destroy
   extend ::ArtfullyOseHelper
   
@@ -14,7 +15,7 @@ class PassType < ActiveRecord::Base
   scope :on_sale, where(:on_sale => true)
   scope :not_ended, where('ends_at > ?', DateTime.now)
 
-  SERVICE_FEE = 0.05
+  ALL_PASSES_STRING = "ALL PASSES"
 
   comma do
     name
@@ -30,6 +31,10 @@ class PassType < ActiveRecord::Base
     sales_start_at
     sales_end_at
   end
+  
+  def sold
+    self.passes.select{ |p| p.person_id.present? }
+  end
 
   def passerize
     self.name.end_with?("Pass") ? self.name : self.name + " Pass"

data/app/models/passes_report.rb

@@ -0,0 +1,117 @@
+class PassesReport
+  attr_accessor :pass_type, :header, :start_date, :end_date, :rows, :counts
+  attr_accessor :tickets_sold, :passes_sold, :total_tickets, :tickets_remaining, :original_price, :discounted
+  extend ::ArtfullyOseHelper
+
+  def pass_type_name
+    pass_type.try(:name) || PassType::ALL_PASSES_STRING
+  end
+
+  def initialize(organization, pass_type, start_date, end_date)  
+    self.pass_type = pass_type
+    self.start_date = start_date
+    self.end_date = end_date
+
+    @orders = find_orders
+
+    self.rows = []
+    @orders.each do |order|
+      self.rows << Row.new(order)
+    end
+
+    build_header
+
+    self.passes_sold      = count_passes_sold
+    self.total_tickets    = calculate_total_tickets
+    self.tickets_sold     = self.rows.inject(0) { |total, row| total + row.ticket_count}
+    self.tickets_remaining= self.total_tickets - self.tickets_sold
+    self.original_price   = self.rows.inject(0) { |total, row| total + row.original_price }
+    self.discounted       = self.rows.inject(0) { |total, row| total + row.discounted }
+  end
+
+  def calculate_total_tickets
+    @passes = Pass.owned
+    if self.pass_type.present?
+      @passes = @passes.where(:pass_type_id => self.pass_type.id)
+    end    
+
+    @passes.sum(:tickets_allowed)
+  end
+
+  def count_passes_sold
+    @items = Item.sold_or_comped.where(:product_type => "Pass")
+    @items = @items.joins("INNER join passes ON items.product_id = passes.id")
+    @items = @items.joins("INNER join pass_types ON passes.pass_type_id = pass_types.id")
+
+    if self.pass_type.present?
+      @items = @items.where("pass_types.id" => self.pass_type)
+    end
+
+    @items = @items.joins(:order)
+    @items = @items.where('orders.created_at > ?',self.start_date)  unless start_date.blank?
+    @items = @items.where('orders.created_at < ?',self.end_date)    unless end_date.blank?
+    @items.count
+  end
+
+  def find_orders
+    @orders = Order.includes(:person, :items => [:show => :event])
+                   .joins(:items)
+                   .joins("INNER join passes ON items.pass_id = passes.id")
+                   .joins("INNER join pass_types ON passes.pass_type_id = pass_types.id")
+                   .group('orders.id')
+                   .order('orders.created_at desc')
+
+    if pass_type.nil?               
+      @orders = @orders.where("pass_types.id is not null")
+    else
+      @orders = @orders.where("pass_types.id" => self.pass_type.id)
+    end
+
+    @orders = @orders.where('orders.created_at > ?',self.start_date)  unless start_date.blank?
+    @orders = @orders.where('orders.created_at < ?',self.end_date)    unless end_date.blank?
+    @orders
+  end
+
+  def build_header
+    self.header = pass_type_name
+    if self.start_date.blank? && self.end_date.blank? 
+      return
+    elsif self.start_date.blank?
+      self.header = self.header + " through #{I18n.localize(DateTime.parse(self.end_date), :format => :slashed_date)}"
+    elsif self.end_date.blank?
+      self.header = self.header + " since #{I18n.localize(DateTime.parse(self.start_date), :format => :slashed_date)}"
+    else
+      self.header = self.header + " from #{I18n.localize(DateTime.parse(self.start_date), :format => :slashed_date)} through #{I18n.localize(DateTime.parse(self.end_date), :format => :slashed_date)}"
+    end
+  end
+
+  class Row
+    attr_accessor :order, :show, :pass_type, :ticket_count, :original_price, :gross, :discounted
+
+    def initialize(order)
+      self.order = order
+      self.pass_type      = order.pass_codes.first.pass_type.name
+      self.show           = order.items_that_used_pass.first.show
+      self.original_price = order.items_that_used_pass.inject(0) { |total, item| total + item.original_price }
+      self.gross          = order.items_that_used_pass.inject(0) { |total, item| total + item.price }
+      self.discounted     = self.original_price - self.gross
+      self.ticket_count   = order.items_that_used_pass.length
+      self.ticket_count   = self.ticket_count * -1 if !order.items_that_used_pass.select(&:refund?).empty?
+    end
+
+    comma do
+      pass_type("Pass")
+      order("Order")          { |order| order.id }
+      order("Order Date")     { |order| order.created_at }
+      order("First Name")     { |order| order.person.first_name }
+      order("Last Name")      { |order| order.person.last_name }
+      order("Email")          { |order| order.person.email }
+      show("Event")           { |show| show.event.name }
+      ticket_count
+      original_price          { |original_price| DiscountsReport.number_as_cents original_price }
+      discounted              { |discounted| DiscountsReport.number_as_cents discounted }
+      gross                   { |gross| DiscountsReport.number_as_cents gross }
+    end
+
+  end
+end

data/app/models/sale_search.rb

@@ -1,7 +1,7 @@
 class SaleSearch
-
-  attr_reader :start, :stop
-  attr_reader :organization, :event, :show
+  include SearchByDates
+  
+  attr_reader :event, :show
 
   def initialize(terms)
     @organization = terms[:organization]
@@ -16,22 +16,4 @@ class SaleSearch
   def results
     @results ||= Order.sale_search(self).select(&:has_ticket?)
   end
-
-  private
-
-  def start_with(start)
-    start.present? ? DateTime.parse(start) : default_start
-  end
-
-  def stop_with(stop)
-    stop.present? ? Sundial.midnightish(@organization, stop) : default_stop
-  end
-
-  def default_start
-    DateTime.now.in_time_zone(@organization.time_zone).beginning_of_month
-  end
-
-  def default_stop
-    DateTime.now.in_time_zone(@organization.time_zone).end_of_day
-  end
 end

data/app/views/contributions/index.html.haml

@@ -6,9 +6,9 @@
   = form_tag contributions_path, :method => :get, :class => 'well form-inline' do
     .pull-left
       = label_tag :start, "From", :class => "control-label"
-      = text_field_tag :start,"#{l @search.start, :format => :date_for_input}", :readonly => true, :class => 'datepicker input-small'
+      = text_field_tag :start,"#{l @search.start, :format => :date_for_input}", :class => 'datepicker input-small'
       = label_tag :stop, "To", :class => "control-label"
-      = text_field_tag :stop, "#{l @search.stop, :format => :date_for_input}", :readonly => true, :class => 'datepicker input-small'
+      = text_field_tag :stop, "#{l @search.stop, :format => :date_for_input}", :class => 'datepicker input-small'
     .pull-right
       = submit_tag "Search", :class => "btn"
       = submit_tag "Download", :class => "btn"

data/app/views/orders/membership.html.haml

@@ -2,26 +2,16 @@
 - content_for :header do
   %h1 Membership Orders
 
-#print-cards.modal.hide.fade
-  .modal-header
-    .close{'data-dismiss'=>'modal'} x
-    %h3 Generating Member Cards
-  .modal-body
-    %p
-      A PDF is being generated and will automatically begin downloading when ready...
-    .progress.progress-success.progress-striped.active
-      .bar{:style => 'width: 90%'}
-
 #donations-search
 
   .control-group.well
-    = form_tag membership_orders_path, :method => :get, :class => 'form-inline' do
+    = form_tag membership_orders_path, :method => :get, :id => 'memberships-date-search-form', :class => 'form-inline' do
       .pull-left
         = label_tag :start, "From", :class => "control-label"
-        = text_field_tag :start,"#{l @search.start, :format => :date_for_input}", :readonly => true, :class => 'datepicker input-small'
+        = text_field_tag :start,"#{l @search.start, :format => :date_for_input}", :class => 'datepicker input-small'
 
         = label_tag :stop, "To", :class => "control-label"
-        = text_field_tag :stop, "#{l @search.stop, :format => :date_for_input}", :readonly => true, :class => 'datepicker input-small'
+        = text_field_tag :stop, "#{l @search.stop, :format => :date_for_input}", :class => 'datepicker input-small'
 
         - if @membership_types.present?
           = label_tag :membership_type_id, nil, :class => "control-label"
@@ -41,7 +31,7 @@
                   = link_to 'Export to CSV', params.merge(:format => 'csv').delete_if {|k,v| :commit == k.to_sym }
                 - with_kit(:membership) do
                   %li
-                    =link_to 'Print Member Cards', new_member_card_path({:start => @search.start, :stop => @search.stop, :membership_type_id => @search.membership_type.try(:id)}), :onclick => "$('#print-cards').modal();"
+                    =link_to 'Print Member Cards', new_member_card_path({:start => @search.start, :stop => @search.stop, :membership_type_id => @search.membership_type.try(:id)})
 
 
 - if @search.results.present?
@@ -59,16 +49,22 @@
       %tbody
         - @search.results.each do |order|
           - order.items.select(&:membership?).each_with_index do |item, index|
-            %tr
-              - if index == 0
+            - if index == 0
+              %tr{:id => "order_#{order.id}"}
                 - rowspan = order.items.select(&:membership?).size
                 %td{:rowspan => rowspan}= link_to order.id, order_path(order.id)
                 %td{:rowspan => rowspan}= l(order.created_at_local_to_organization, :format => :short)
                 %td{:rowspan => rowspan}= link_to_person(order.person)
                 %td{:rowspan => rowspan}= (order.payment_method || "")
-              %td 
-                ="#{item.product.membership_type.name}"
-              %td= number_as_cents item.price
+                %td 
+                  ="#{item.product.membership_type.name}"
+                %td= number_as_cents item.price
+            - else
+              %tr
+                %td 
+                  ="#{item.product.membership_type.name}"
+                %td= number_as_cents item.price
+
     = will_paginate(@search.results)
 
 - else

data/app/views/orders/passes.html.haml

@@ -0,0 +1,97 @@
+- in_section :transactions
+- content_for :header do
+  %h1 Pass Orders
+
+#donations-search
+
+  .control-group.well
+    = form_tag passes_orders_path, :method => :get, :id => 'passes-date-search-form', :class => 'form-inline' do
+      .pull-left
+        = label_tag :start, "From", :class => "control-label"
+        = text_field_tag :start,"#{l @search.start, :format => :date_for_input}", :class => 'datepicker input-small'
+
+        = label_tag :stop, "To", :class => "control-label"
+        = text_field_tag :stop, "#{l @search.stop, :format => :date_for_input}", :class => 'datepicker input-small'
+
+        - if @pass_types.present?
+          = label_tag :pass_type_id, nil, :class => "control-label"
+          = raw select_pass_type_for_sales_search @pass_types, :pass_type_id, params[:pass_type_id]
+
+        = submit_tag "Search", :class => "btn"
+
+
+      - if @search.results.present?
+        .pull-right
+
+          %ul.in-table
+            %li.dropdown#bulkactions
+              =icon_link_to('Work with...', "#menu#bulkactions", 'fa-asterisk', 'dropdown-toggle dropdown btn', '')
+              %ul.dropdown-menu
+                %li
+                  = link_to 'Export to CSV', params.merge(:format => 'csv').delete_if {|k,v| :commit == k.to_sym }
+
+
+- if @search.results.present?
+
+  #tickets
+    %table.standalone.zebra.table
+      %thead
+        %tr
+          %th Order
+          %th Time
+          %th Person
+          %th Method
+          %th Membership Type
+          %th Amount
+      %tbody
+        - @search.results.each do |order|
+          - order.items.select(&:pass?).each_with_index do |item, index|
+            - if index == 0
+              %tr{:id => "order_#{order.id}"}
+                - rowspan = order.items.select(&:pass?).size
+                %td{:rowspan => rowspan}= link_to order.id, order_path(order.id)
+                %td{:rowspan => rowspan}= l(order.created_at_local_to_organization, :format => :short)
+                %td{:rowspan => rowspan}= link_to_person(order.person)
+                %td{:rowspan => rowspan}= (order.payment_method || "")
+                %td 
+                  ="#{item.product.pass_type.name}"
+                %td= number_as_cents item.price
+            - else
+              %tr
+                %td 
+                  ="#{item.product.pass_type.name}"
+                %td= number_as_cents item.price
+
+    = will_paginate(@search.results)
+
+- else
+
+  %h4= "No sales found."
+
+- content_for :custom_js do
+  :javascript
+    var printCardInterval;
+
+    $('#print-cards').on('show', function (show) {
+      // Remove any existing intervals
+      clearInterval(printCardInterval);
+
+      // Initial hurry to 90%
+      var bar = $('#print-cards .bar');
+      $(bar).css('width', '1%').animate({width: '90%'}, 1500, function() {
+
+          // Progress to 100% from there
+          var times = 0;
+          printCardInterval = setInterval(function() {
+            // Count this run
+            times = times + 1;
+
+            // Update the progress bar
+            $(bar).css('width', (90 + times) + '%');
+
+            // Clear the interval on the last run
+            if (times > 9) { clearInterval(printCardInterval); }
+          }, 1000);
+
+      });
+    });

data/app/views/orders/sales.html.haml

@@ -7,10 +7,10 @@
     .control-group.well
       .pull-left
         = label_tag :start, "From", :class => "control-label"
-        = text_field_tag :start,"#{l @search.start, :format => :date_for_input}", :readonly => true, :class => 'datepicker input-small'
+        = text_field_tag :start,"#{l @search.start, :format => :date_for_input}", :class => 'datepicker input-small'
 
         = label_tag :stop, "To", :class => "control-label"
-        = text_field_tag :stop, "#{l @search.stop, :format => :date_for_input}", :readonly => true, :class => 'datepicker input-small'
+        = text_field_tag :stop, "#{l @search.stop, :format => :date_for_input}", :class => 'datepicker input-small'
 
         - if @events.present?
           = label_tag :event_id, nil, :class => "control-label"

data/app/views/pass_types/index.html.haml

@@ -21,7 +21,7 @@
       %td=link_to pass_type.name, edit_pass_type_path(pass_type)
       %td=l pass_type.starts_at, :format => :slashed_date
       %td=l pass_type.ends_at, :format => :slashed_date
-      %td.right=pass_type.passes.count
+      %td.right=pass_type.sold.count
       %td.right=pass_type.tickets_allowed
       %td.right=number_as_cents pass_type.price
       %td.right

data/app/views/passes_reports/index.html.haml

@@ -1,2 +1,80 @@
 -content_for :header do
-  %h1 Passes
+  %h1 Pass Usage
+
+= form_tag passes_reports_path, :method => :get, :class => 'well form-inline' do
+  = label_tag :pass_type, "Pass", :class => "control-label"
+  = select_tag :pass_type, options_for_select(@options_for_select, @report.pass_type.try(:id))
+
+
+  = label_tag :start_date, "From", :class => "control-label"
+  = text_field_tag :start_date, @start_date, :readonly => true, :class => 'datepicker input-small'
+
+  = label_tag :end_date, "To", :class => "control-label"
+  = text_field_tag :end_date, @end_date, :readonly => true, :class => 'datepicker input-small'
+      
+  .pull-right
+    = submit_tag "Search", :class => "btn"
+
+- unless @report.nil?
+
+  .row-fluid.botton-room
+    .span9
+      %h3=@report.header
+    .span3
+      .pull-right
+        =link_to "Download CSV", passes_reports_path(code: @report.pass_type, start_date: @report.start_date, end_date: @report.end_date, format: "csv"), :class => "btn"
+
+  #statement-summary.bottom-room.well
+    .row-fluid
+      .span4
+        .center.headline-stat#passes-sold-stat
+          =@report.passes_sold
+        .center.headline-caption
+          %h6 PASSES SOLD
+      .span4
+        .center.headline-stat#tickets-sold-stat
+          =@report.tickets_sold
+        .center.headline-caption
+          %h6 TICKETS SOLD
+      .span4
+        .center.headline-stat#tickets-remaining-stat
+          =@report.tickets_remaining
+        .center.headline-caption
+          %h6 TICKETS REMAINING
+
+  .row
+    .span12
+      %table.table.zebra#order-table
+        %thead
+          %tr
+            %th{:style=>'width:200px'} Pass
+            %th Order/Date
+            %th{:style=>'width:200px'} Person
+            %th Event
+            %th.right Tickets
+            %th.right Orig. Price
+            %th.right Gross
+        %tbody
+          -if @rows.empty?
+            %tr
+              %td{:colspan => 7}
+                .no-image#no-pass-sales
+                  #text
+                    =icon_tag '299-ticket'
+                    %br
+                    This pass hasn't been used to buy any tickets.
+          -@rows.each do |row|
+            %tr
+              %td=row.pass_type
+              %td
+                =link_to row.order.id, order_path(row.order)
+                %br
+                =l row.order.created_at, :format => :slashed_date
+              %td
+                =link_to row.order.person, person_path(row.order.person)
+              %td=link_to row.show.event.name, event_path(row.show.event)
+              %td.right=row.ticket_count
+              %td.right=number_as_cents row.original_price
+              %td.right=number_as_cents row.gross
+
+    = will_paginate(@rows)

data/app/views/store/passes/index.html.haml

@@ -17,7 +17,7 @@
                 .title.active
                   .price
                     =number_as_cents pass_type.price
-                  .membership_type_name
+                  .pass_type_name
                     =pass_type.name
             =pass_type.description
             %br
@@ -26,7 +26,7 @@
               = form_for pass_type, :as => :pass_type, :url => store_order_path(@store_organization.cached_slug), :html => {:id => "edit_pass_type_#{pass_type.id}"}, :method => :post do |f| 
                 = f.hidden_field :id
                 = select_tag :quantity, options_for_select((1..6).to_a.map {|i| [pluralize(i, "#{pass_type.passerize}"), i]})
-                = f.submit 'Add to cart', :class => 'btn btn-primary', :style => 'margin-top: -10px'
+                = f.submit 'Add to cart', :class => 'add-to-cart btn btn-primary', :style => 'margin-top: -10px'
       
     .span4
       .side-section

data/config/routes.rb

@@ -286,6 +286,7 @@ Rails.application.routes.draw do
     resource :assignment, :only => [ :new, :create ]
     collection do
       get :membership
+      get :passes
       get :sales
     end
     member do

data/lib/artfully_ose/version.rb

@@ -1,3 +1,3 @@
 module ArtfullyOse
-  VERSION = "1.2.0.alpha.2"
+  VERSION = "1.2.0.beta.1"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: artfully_ose
 version: !ruby/object:Gem::Version
-  version: 1.2.0.alpha.2
+  version: 1.2.0.beta.1
 platform: ruby
 authors:
 - Artful.ly
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-08-26 00:00:00.000000000 Z
+date: 2014-09-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -1916,6 +1916,7 @@ files:
 - app/concerns/itemable.rb
 - app/concerns/oh_noes.rb
 - app/concerns/pdf_generation.rb
+- app/concerns/search_by_dates.rb
 - app/concerns/unrefundable.rb
 - app/controllers/actions_controller.rb
 - app/controllers/addresses_controller.rb
@@ -2122,8 +2123,10 @@ files:
 - app/models/organization_ability.rb
 - app/models/parsed_row.rb
 - app/models/pass.rb
+- app/models/pass_sale_search.rb
 - app/models/pass_summary.rb
 - app/models/pass_type.rb
+- app/models/passes_report.rb
 - app/models/payment.rb
 - app/models/payments/cash_payment.rb
 - app/models/payments/check_payment.rb
@@ -2354,6 +2357,7 @@ files:
 - app/views/orders/_search_form.haml
 - app/views/orders/index.html.haml
 - app/views/orders/membership.html.haml
+- app/views/orders/passes.html.haml
 - app/views/orders/sales.html.haml
 - app/views/orders/show.html.haml
 - app/views/organizations/_connection_form.html.haml