artfully_ose 1.2.0.beta.1 → 1.2.0.pre

data/app/models/ticket/locker.rb

@@ -32,8 +32,7 @@ module Ticket::Locker
             .where(:cart_id => cart)
             .uncommitted
             .update_all({ :cart_id        => nil, 
-                          :ticket_type_id => nil,
-                          :pass_id        => nil,  
+                          :ticket_type_id => nil, 
                           :cart_price     => nil,
                           :sold_price     => nil,
                           :service_fee    => 0,

data/app/models/ticket/pricing.rb

@@ -5,27 +5,17 @@ module Ticket::Pricing
     self.update_column(:cart_id, nil)
   end
 
-  def prepare_for_cart_change!
+  def prepare_for_discount!
     return false if sold?
     self.discount = nil
-    self.pass = nil
     self.sold_price = nil
     self.cart_price = self.price
     self.save
-  end
-
-  def prepare_for_discount!
-    prepare_for_cart_change!
-  end 
-
-  def prepare_for_pass!
-    prepare_for_cart_change!
   end 
 
   def reset_price!
     return false if sold?
     self.discount = nil
-    self.pass     = nil
     self.ticket_type = nil
     self.sold_price = nil
     self.cart_price = nil

data/app/models/ticket/reports.rb

@@ -26,22 +26,6 @@ module Ticket::Reports
     def total
       tickets.select(&:on_sale?).length
     end
-
-    def on_sale
-      total
-    end
-
-    def off_sale
-      tickets.select(&:off_sale?).length
-    end
-
-    def open
-      on_sale + off_sale
-    end
-
-    def capacity
-      tickets.length
-    end
   end
 
   class Sold < Base

data/app/models/ticket/sale_transitions.rb

@@ -23,9 +23,6 @@ module Ticket::SaleTransitions
       attempt_transition(tickets, :off_sale) do
         Ticket.update_all({ :state => :off_sale }, { :id => tickets.collect(&:id)})
       end
-      Rails.logger.info ("Completed off saling!")
-      tickets.first.show.refresh_stats
-      Rails.logger.info ("Completed off sailing!")
     end
 
     def put_on_sale(tickets)
@@ -33,7 +30,6 @@ module Ticket::SaleTransitions
       attempt_transition(tickets, :on_sale) do
         Ticket.update_all({ :state => :on_sale }, { :id => tickets.collect(&:id)})
       end
-      tickets.first.show.refresh_stats
     end
 
     def attempt_transition(tickets, state)

data/app/models/ticket/template.rb

@@ -32,7 +32,6 @@ class Ticket::Template
       t = Ticket.new(attributes)
       t.organization_id = organization_id
       t.show_id = show_id
-      t.set_uuid
       tickets << t
     end
     tickets

data/app/models/ticket/transfers.rb

@@ -6,9 +6,6 @@ module Ticket::Transfers
       self.buyer = buyer
       self.sold_at = time
       self.sell!
-      # moved to order_processor 
-      # generate_qr_code
-      self.show.refresh_stats
     rescue Transitions::InvalidTransition
       return false
     end
@@ -22,9 +19,6 @@ module Ticket::Transfers
       self.buyer = buyer
       self.sold_at = time
       self.exchange!
-      # moved to order_processor 
-      # generate_qr_code
-      self.show.refresh_stats
     rescue Transitions::InvalidTransition => e
       puts e
       return false
@@ -37,9 +31,6 @@ module Ticket::Transfers
       self.sold_price = 0
       self.sold_at = time
       self.comp!
-      # moved to order_processor 
-      # generate_qr_code
-      self.show.refresh_stats
     rescue Transitions::InvalidTransition => e
       puts e
       return false
@@ -52,10 +43,9 @@ module Ticket::Transfers
     self.buyer = nil
     self.sold_at = nil
     self.buyer_id = nil
-    self.qr_code = nil
+    Rails.logger.debug(self.inspect)
     self.reset_price!
-    self.show.refresh_stats
     save
   end
 
-end
+end

data/app/models/ticket_summary.rb

@@ -14,20 +14,14 @@ class TicketSummary
   end
   
   class TicketSummary::Row
-    attr_accessor :show, :tickets, :ticket_type_hash
+    attr_accessor :show, :tickets
     
     def initialize
       @tickets = []
-      @ticket_type_hash = {}
     end
     
     def <<(ticket)
       @tickets << ticket
-      if @ticket_type_hash[ticket.ticket_type].nil?
-        @ticket_type_hash[ticket.ticket_type] = []
-      end
-
-      @ticket_type_hash[ticket.ticket_type] << ticket
       @show = ticket.show
       self
     end

data/app/models/ticket_type.rb

@@ -1,17 +1,9 @@
 class TicketType < ActiveRecord::Base
   belongs_to  :section
   belongs_to  :show
-  belongs_to  :membership_type
   delegate    :chart, :to => :section
   has_many    :tickets
-
-  after_save  { self.chart.upgrade_event unless self.chart.nil? }
-  attr_accessible :name, :price, :limit, :description, :storefront, :box_office, :members, 
-                  :membership_type_id, :tickets_per_membership, :member_ticket
-
-  before_save :clear_membership_type_id
-
-  validates :membership_type_id,    :presence => true, :if => :member_ticket?
+  attr_accessible :name, :price, :limit, :description, :storefront, :box_office, :members
 
   def as_json(options = {})
     {
@@ -25,56 +17,21 @@ class TicketType < ActiveRecord::Base
   end
 
   #
-  # Returns Tickets
+  # Returns tickets
   #
-  def available_tickets(ticket_limit = 4, member = nil)
+  def available_tickets(ticket_limit = 4)
     Ticket.available({:section_id     => self.section.id,
                       :ticket_type_id => nil }, 
-                      [ticket_limit, self.available(member)].min)
+                      [ticket_limit, self.available].min)
   end
 
   #
   # Returns an integer number of tickets available
   #
-  def available(channel = "storefront", member = nil)
+  def available
     available_in_section = Ticket.where(:section_id => self.section, :state => :on_sale, :cart_id => nil, :ticket_type_id => nil).count
-
-    return available_in_section if unlimited? && !self.member_ticket?
-
-    available_measures = []
-    available_measures << limit - committed.length - locked.length unless limit.nil?
-    available_measures << available_in_section
-    available_measures << available_to(member, available_in_section) if self.member_ticket? && channel == "storefront"
-
-    [ available_measures.min, 0].max
-  end
-
-  def available_to(member, limit = 0)
-    if member.nil?
-      return 0 if self.member_ticket?
-    elsif self.tickets_per_membership.nil?
-      return limit
-    else
-      #how many member tickets has this member purchased for this show?
-      member_tickets_purchased = member.member_tickets_purchased_for(self.show.event).count
-
-      #how many tickets this member entitled to?
-      tickets_entitled_to = member.memberships.current.where(:membership_type_id => self.membership_type_id).count * self.tickets_per_membership
-
-      member_tickets_available = tickets_entitled_to - member_tickets_purchased
-      member_tickets_available
-    end    
-  end
-
-  def applies_to_pass?(pass)
-    epts = EventsPassType.active
-                  .where(:organization_id => pass.organization.id)
-                  .where(:event_id => self.show.event.id)
-                  .where(:pass_type_id => pass.pass_type.id).first
-
-    return false if epts.blank?
-
-    return epts.ticket_types.include?(self.name)
+    return available_in_section if unlimited?
+    [ [limit - committed.length - locked.length, available_in_section].min, 0].max
   end
 
   def self.price_to_cents(price_in_dollars)
@@ -98,10 +55,6 @@ class TicketType < ActiveRecord::Base
     @@channels
   end
 
-  def self.channels_for(organization)
-    (organization.can? :access, :membership) ? @@channels : @@channels.except(:members)
-  end
-
   def sold
     tickets.select {|t| t.sold?}
   end
@@ -129,9 +82,4 @@ class TicketType < ActiveRecord::Base
   def self.set_show(show)
     TicketType.joins(:section => :chart).where('charts.id = ?', show.chart_id).update_all(:show_id => show.id)
   end
-
-  private
-    def clear_membership_type_id
-      self.membership_type_id = nil unless self.member_ticket?
-    end
 end

data/app/models/user.rb

@@ -1,11 +1,8 @@
-class User < ActiveRecord::Base
+  class User < ActiveRecord::Base
 
   include Ext::DeviseConfiguration
   include Ext::Integrations::User
 
-  devise      :token_authenticatable
-  before_save :ensure_authentication_token
-
   has_many :shows
   has_many :orders
   has_many :imports
@@ -21,20 +18,20 @@ class User < ActiveRecord::Base
   end
 
   # Setup accessible (or protected) attributes for your model
-  attr_accessible :email, :password, :password_confirmation, :remember_me, :user_agreement, :newsletter_emails, :first_name, :last_name, :user_memberships_attributes
+  attr_accessible :email, :password, :password_confirmation, :remember_me, :user_agreement, :newsletter_emails
 
   def is_in_organization?
-    @is_in_organization ||= !!(user_memberships.any? && ! user_memberships.first.organization.new_record?)
+    @is_in_organization ||= user_memberships.any?
   end
 
   def current_organization
-    @current_organization ||= is_in_organization? ? user_memberships.first.organization : Organization.new
+    @current_organization ||= (is_in_organization? ? user_memberships.first.organization : Organization.new)
   end
 
   def membership_in(organization)
     user_memberships.where(:organization_id => organization.id).limit(1).first
   end
-
+  
   def self.like(query = "")
     return if query.blank?
     q = "%#{query}%"
@@ -47,14 +44,4 @@ class User < ActiveRecord::Base
   def active_for_authentication?
     super && !suspended?
   end
-
-  def to_s
-    if first_name.present? || last_name.present?
-      [first_name, last_name].reject(&:blank?).join(" ")
-    elsif email.present?
-      email.to_s
-    else
-      "No Name ##{id}"
-    end
-  end
 end

data/app/models/user_membership.rb

@@ -1,28 +1,10 @@
 class UserMembership < ActiveRecord::Base
+  
   # Be careful here!  :user needs to come out of this if we ever support update action on memberships controller
-  attr_accessible :user, :organization_attributes
-
+  attr_accessible :user
+  
   belongs_to :user
   belongs_to :organization
 
-  accepts_nested_attributes_for :organization
-
   validates :user_id, :uniqueness => {:scope => :organization_id}
-
-  #
-  # Will promote new_owner to admin and demote any other owners
-  #
-  def self.promote(new_owner, organization)
-
-    @user_membership = UserMembership.where(:user_id => new_owner.id, :organization_id => organization.id).first
-
-    return false if @user_membership.nil?
-
-    @user_membership.transaction do
-      UserMembership.where(:organization_id => organization.id).update_all(:owner => false)
-      @user_membership.reload
-      @user_membership.owner  = true
-      return @user_membership.save
-    end
-  end
 end

data/app/models/valuation/lifetime_ticket_value.rb

@@ -22,7 +22,7 @@ module Valuation
     # Return the value
     #
     def calculate_lifetime_ticket_value
-      self.lifetime_ticket_value = Item.where(:order_id => self.lifetime_orders).ticket.sum(Item.total_price_sql_sum).to_i
+      self.lifetime_ticket_value = Item.where(:order_id => self.lifetime_orders).where(:product_type => "Ticket").sum(Item.total_price_sql_sum).to_i
       self.save(:validate => false)
       self.lifetime_ticket_value
     end

data/app/models/venue.rb

@@ -2,16 +2,15 @@ require 'geocoder'
 
 class Venue < ActiveRecord::Base
   belongs_to :organization
-  has_one :event
-
+  belongs_to :event
+ 
   validates_presence_of :name
   
-  attr_accessible :name, :address1, :address2, :city, :state, :zip, :time_zone, :lat, :long
-  
-  geocoded_by :full_street_address, :latitude => :lat, :longitude => :long
+  attr_accessible :name, :address1, :address2, :city, :state, :zip, :time_zone
 
-  after_save :run_geocode, :if => :address1_changed?
-  after_save :refresh_show_stats, :if => :time_zone_changed?
+  geocoded_by :geocode_address, :latitude => :lat, :longitude => :long
+
+  before_save :geocode, :if => :address1_changed?
   
   def address_as_string
     street_as_string + " " + city_state_zip_as_string
@@ -31,21 +30,8 @@ class Venue < ActiveRecord::Base
     URI::escape(street_as_string + " " + city_state_zip_as_string)
   end
 
-  def full_street_address
+  def geocode_address
     (address1 || "") + ", " + (address2 || "") + ", " + (city || "") +
       ", " + (state || "") + " " + (zip || "")
   end
-
-  def refresh_show_stats
-    unless self.event.nil?
-      self.event.shows.each {|s| s.delay.refresh_stats }
-    end
-  end
-  
-  private
-
-    def run_geocode
-      Delayed::Job.enqueue(GeocodeAddressJob.new(self))
-    end
-  
 end

data/app/presenters/event_presenter.rb

@@ -4,7 +4,7 @@ module EventPresenter
     def options_for_select_by_organization(organization)
       where(organization_id: organization.id).collect do |event|
         [event.name, event.id]
-      end.sort{|a, b| a[0] <=> b[0]} #.unshift([Event::ANY_EVENT_TEXT, Event::ANY_EVENT_ID])
+      end.sort{|a, b| a[0] <=> b[0]}
     end
   end
 

data/app/views/actions/_form.html.haml

@@ -3,11 +3,11 @@
   - if action.new_record?
     .btn-group.action-type{"data-toggle" => "buttons-radio"}
       -if target.is_a? Person
-        = action_type_button(action, 'hear', 'Heard', "Record a communication you sent to #{target}.")
-        = action_type_button(action, 'say', 'Said', "Record a communication #{target} initiated.")
-        = action_type_button(action, 'go', 'Went', "Record when #{target} attended an event.")
-        = action_type_button(action, 'do', 'Helped', "Record when #{target} volunteered")
-        = link_to 'Gave', new_contribution_path("contribution[person_id]" => target.id), :class => "btn edit-order-link weak", "data-remote" => "true"
+        = action_type_button(action, 'hear', 'Heard', "Record a communication you sent to #{@person}.")
+        = action_type_button(action, 'say', 'Said', "Record a communication #{@person} initiated.")
+        = action_type_button(action, 'go', 'Went', "Record when #{@person} attended an event.")
+        = action_type_button(action, 'do', 'Helped', "Record when #{@person} volunteered")
+        = link_to 'Gave', new_contribution_path("contribution[person_id]" => @person.id), :class => "btn edit-order-link weak", "data-remote" => "true"
       -else
         = action_type_button(action, 'hear', 'Heard', "Record a communication you sent to this group")
         = action_type_button(action, 'say', 'Said', "Record a communication this group initiated")
@@ -44,4 +44,4 @@
     .modal-body
       = simple_format "Are you sure you want to delete this action?  This cannot be undone."
     .modal-footer
-      = link_to "Delete this action", person_action_path(target, action), :method => :delete, :class => "delete-confirm-link btn btn-danger"
+      = link_to "Delete this action", person_action_path(@person, action), :method => :delete, :class => "delete-confirm-link btn btn-danger"

data/app/views/actions/get/_show.html.haml

@@ -1,3 +1,14 @@
-=render :partial => "actions/shared/show", :locals => { :action => action }
+%p
+  =render :partial => "actions/shared/show", :locals => { :action => action }
 
-%p= link_to "View order details <i class='fa fa-share'></i>".html_safe, order_path(action.subject)
+
+%ul
+  - action.subject.items.each do |item|
+    %li #{number_as_cents(item.price)} - #{item.order_summary_description}
+  %li 
+    %strong #{number_as_cents(action.subject.total||0)} - Total
+  - if action.subject.notes.present?
+    %li
+      %strong Note:
+      = action.subject.notes
+%p= link_to "View order details <i class='icon-share-alt'></i>".html_safe, order_path(action.subject)