artfully_ose 1.0.0.rc4 → 1.1.0.rc1

data/app/models/ticket/reports.rb

@@ -1,3 +1,6 @@
+#
+# This needs to be refactored to be less database intensive
+#
 module Ticket::Reports
   class Base
     def initialize(parent)
@@ -21,13 +24,13 @@ module Ticket::Reports
 
   class Available < Base
     def total
-      tickets.on_sale.count
+      tickets.select(&:on_sale?).length
     end
   end
 
   class Sold < Base
     def total
-      tickets.sold.count
+      tickets.select(&:sold?).length
     end
 
     def today
@@ -41,7 +44,7 @@ module Ticket::Reports
 
   class Comped < Base
     def total
-      tickets.comped.count
+      tickets.select(&:comped?).length
     end
 
     def today
@@ -55,19 +58,19 @@ module Ticket::Reports
 
   class Sales < Base
     def total
-      tickets.sold.sum(:price)
+      tickets.sold.sum(:sold_price)
     end
 
     def today
-      tickets.sold_after(Time.now.beginning_of_day).sum(:price)
+      tickets.sold_after(Time.now.beginning_of_day).sum(:sold_price)
     end
 
     def played
-      tickets.sold.played.sum(:price)
+      tickets.sold.played.sum(:sold_price)
     end
 
     def advance
-      tickets.sold.unplayed.sum(:price)
+      tickets.sold.unplayed.sum(:sold_price)
     end
   end
 

data/app/models/ticket/sale_transitions.rb

@@ -0,0 +1,44 @@
+module Ticket::SaleTransitions
+  extend ActiveSupport::Concern
+
+  def take_off_sale
+    begin
+      off_sale!
+    rescue Transitions::InvalidTransition
+      return false
+    end
+  end
+
+  def put_on_sale
+    begin
+      on_sale!
+    rescue Transitions::InvalidTransition
+      return false
+    end
+  end
+
+  module ClassMethods
+    def take_off_sale(tickets)
+      return false if tickets.blank?
+      attempt_transition(tickets, :off_sale) do
+        Ticket.update_all({ :state => :off_sale }, { :id => tickets.collect(&:id)})
+      end
+    end
+
+    def put_on_sale(tickets)
+      return false if tickets.blank?
+      attempt_transition(tickets, :on_sale) do
+        Ticket.update_all({ :state => :on_sale }, { :id => tickets.collect(&:id)})
+      end
+    end
+
+    def attempt_transition(tickets, state)
+      begin
+        tickets.map(&state)
+        yield
+      rescue Transitions::InvalidTransition
+        logger.info "Trying to transition ticket [#{}] on_sale, transition failed"
+      end
+    end
+  end
+end

data/app/models/ticket/transfers.rb

@@ -0,0 +1,50 @@
+module Ticket::Transfers
+  extend ActiveSupport::Concern
+
+  def sell_to(buyer, time=Time.now)
+    begin
+      self.buyer = buyer
+      self.sold_at = time
+      self.sell!
+    rescue Transitions::InvalidTransition
+      return false
+    end
+  end
+  
+  #
+  # Deals solely with changing the buyer.  Pricing should be handled in exchange_prices_from
+  #
+  def exchange_to(buyer, time=Time.now)
+    begin
+      self.buyer = buyer
+      self.sold_at = time
+      self.exchange!
+    rescue Transitions::InvalidTransition => e
+      puts e
+      return false
+    end
+  end
+
+  def comp_to(buyer, time=Time.now)
+    begin
+      self.buyer = buyer
+      self.sold_price = 0
+      self.sold_at = time
+      self.comp!
+    rescue Transitions::InvalidTransition => e
+      puts e
+      return false
+    end
+  end
+
+  def return!(and_return_to_inventory = true)
+    and_return_to_inventory ? return_to_inventory! : return_off_sale!
+    remove_from_cart
+    self.buyer = nil
+    self.sold_at = nil
+    self.buyer_id = nil
+    self.reset_price!
+    save
+  end
+
+end

data/app/models/user.rb

@@ -1,4 +1,4 @@
-class User < ActiveRecord::Base
+  class User < ActiveRecord::Base
 
   include Ext::DeviseConfiguration
   include Ext::Integrations::User
@@ -6,6 +6,7 @@ class User < ActiveRecord::Base
   has_many :shows
   has_many :orders
   has_many :imports
+  has_many :discounts
 
   has_many :memberships
   has_many :organizations, :through => :memberships
@@ -34,6 +35,13 @@ class User < ActiveRecord::Base
   def self.like(query = "")
     return if query.blank?
     q = "%#{query}%"
-    self.joins("LEFT OUTER JOIN memberships ON memberships.user_id = users.id").joins("LEFT OUTER JOIN organizations ON organizations.id = memberships.organization_id").where("email like ? or organizations.name like ?", q, q)
+    self.joins("LEFT OUTER JOIN memberships m ON m.user_id = users.id")
+        .joins("LEFT OUTER JOIN organizations o ON o.id = m.organization_id")
+        .includes(:organizations)
+        .where("users.email like ? or o.name like ?", q, q)
+  end
+
+  def active_for_authentication?
+    super && !suspended?
   end
 end

data/app/models/valuation/lifetime_donations.rb

@@ -0,0 +1,35 @@
+module Valuation
+
+  #
+  # Anything with a :lifetime_donations column and has_many donations can use this module.
+  #
+  module LifetimeDonations
+    extend ActiveSupport::Concern
+    
+    #
+    # Includers can define a method called lifetime_donations which
+    # will override this method.
+    #
+    # lifetime_donations should return the donations that this model wants to include in the calculation
+    #  
+    def lifetime_orders
+      orders
+    end
+    
+    #
+    # Calculate the lifetime donations of this model by summing the price of all donations 
+    # attached to orders attached to this person.  Save the donations in lifetime_donations.
+    # Return the total
+    #
+    # This could be done (probably faster) in a single sql SELECT SUM suery 
+    #
+    def calculate_lifetime_donations
+      self.lifetime_donations = 0
+      lifetime_orders.each do |o|
+        o.donations.each { |i| self.lifetime_donations = self.lifetime_donations + i.price}
+      end
+      save
+      lifetime_donations
+    end
+  end
+end

data/app/models/venue.rb

@@ -1,3 +1,5 @@
+require 'geocoder'
+
 class Venue < ActiveRecord::Base
   belongs_to :organization
   belongs_to :event
@@ -5,6 +7,10 @@ class Venue < ActiveRecord::Base
   validates_presence_of :name
   
   attr_accessible :name, :address1, :address2, :city, :state, :zip, :time_zone
+
+  geocoded_by :geocode_address, :latitude => :lat, :longitude => :long
+
+  before_save :geocode, :if => :address1_changed?
   
   def street_as_string
     str = (address1 || "") + " " + (address2 || "")
@@ -19,4 +25,9 @@ class Venue < ActiveRecord::Base
   def address_as_url_query
     URI::escape(street_as_string + " " + city_state_zip_as_string)
   end
-end
+
+  def geocode_address
+    (address1 || "") + ", " + (address2 || "") + ", " + (city || "") +
+      ", " + (state || "") + " " + (zip || "")
+  end
+end

data/app/presenters/event_presenter.rb

@@ -0,0 +1,41 @@
+module EventPresenter
+  module ClassMethods
+    # Presents events for a select tag in the views
+    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]}
+    end
+  end
+
+  module InstanceMethods
+    def to_s
+      self.name || ""
+    end
+
+    ### JSON Methods
+    def as_widget_json(options = {})
+      as_json(options.merge(:methods => ['shows', 'charts', 'venue'])).merge('performances' => upcoming_public_shows.as_json)
+    end
+
+    def as_full_calendar_json
+      shows.collect do |p|
+        { :title  => '',
+          :start  => p.datetime_local_to_event,
+          :allDay => false,
+          :color  => '#077083',
+          :id     => p.id
+        }
+      end
+    end
+
+    def as_json(options = {})
+      super(options)
+    end
+  end
+
+  def self.included(receiver)
+    receiver.extend         ClassMethods
+    receiver.send :include, InstanceMethods
+  end
+end

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

@@ -19,8 +19,7 @@
         %tr
           %td.starred.starable{"data-person-id" => person.id, "data-type" => 'action', "data-action-id" => action.id }= (action.starred? ? "✭" : "✩").html_safe
           %td= l action.occurred_at_local_to_organization, :format => :short unless action.occurred_at.nil?
-          %td="#{action.action_type.capitalize} - #{action.subtype unless action.subtype.nil?}"
+          %td=action_and_subtype(action)
           %td= full_details(action)
           %td
             =link_to("Edit", edit_person_action_path(person, action, :format => :html, :type => :hear), :class => "btn btn-mini edit-action-link", :remote => true) if action.action_type == "Hear"
-            =link_to("Edit", edit_person_action_path(person, action, :type => :give), :class => "btn btn-mini", :remote => true) if action.action_type == "Give" unless action.creator_id.nil?

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

@@ -1,7 +1,7 @@
 .modal-header
   %h3 Hear Action
 
-= form_for @action, :url => person_actions_path, :as => :artfully_action do |form|
+= form_for @action, :url => self.send(@form_action), :as => :artfully_action do |form|
   .modal-body
     = hidden_field_tag "action_type", params[:type]
     = form.label :subtype, "Action Type"

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

@@ -0,0 +1,40 @@
+- if current_user.current_organization.has_active_fiscally_sponsored_project?
+  %p Use this form for recording contributions received outside of Fractured Atlas.  Donations to Fractured Atlas Fiscally Sponsored Projects should be made through Fractured Atlas.  Please <a href='mailto:support@artful.ly'>contact support</a> with any questions.
+
+= form_for(contribution, :html=>{ :class=>'form-horizontal' }) do |form|
+  = form.hidden_field :person_id
+  = form.hidden_field :organization_id
+  = hidden_field_tag(:order_id, contribution.order.id) if contribution.order
+  .control-group
+    = form.label :subtype, "Type", :class => 'control-label'
+    .controls
+      = form.select :subtype, options_for_select(Action::GIVE_TYPES, contribution.subtype)
+      
+  .control-group
+    = form.label :payment_method, "Payment method", :class => 'control-label'
+    .controls
+      = form.select :payment_method, options_for_select([ "Cash", "Check", "Credit card", "Other" ], contribution.payment_method)
+    
+  .control-group
+    = form.label :amount, "Deductible Amount", :class => 'control-label'
+    .controls      
+      = form.text_field :amount, :class => :currency
+    
+  .control-group
+    = form.label :nongift_amount, "Non-Deductible Amount", :class => 'control-label'
+    .controls      
+      = form.text_field :nongift_amount, :class => :currency
+    
+  .control-group
+    = form.label :occurred_at, "Date and Time", :class => 'control-label'
+    .controls  
+      = form.text_field :occurred_at, :value => l(contribution.occurred_at_local_to_organization, :format => :datetime_for_input), :readonly => true, :class => :datetimepicker
+      
+  .control-group
+    = form.label :details, "Notes", :class => 'control-label'
+    .controls 
+      = form.text_area :details, :size => "20x5" 
+  
+  .form-actions
+    = submit_tag "Save", :class => "btn"
+    = link_to "Cancel", cancel_path, :class => "btn"

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

@@ -0,0 +1,12 @@
+%h2="#{contribution.contributor}"
+#details
+  %ul
+    %li
+      %h6.key Email
+      .value= @contribution.contributor.email
+    %li
+      %h6.key Company
+      .value= @contribution.contributor.company_name || "&nbsp".html_safe
+    %li
+      %h6.key Website
+      .value= @contribution.contributor.website || "&nbsp".html_safe

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

@@ -0,0 +1,11 @@
+.modal-header
+  .close{'data-dismiss'=>'modal'} x
+  %h3 Edit Contribution
+
+.modal-body
+  =render :partial => "form", :locals => {:contribution => @contribution, :cancel_path => order_path(@contribution.order.id)}
+
+
+
+
+

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

@@ -6,7 +6,7 @@
   = form_tag contributions_path, :method => :get, :class => 'well form-inline' do
     = label_tag :start, "From", :class => "control-label"
     = text_field_tag :start,"#{l @search.start, :format => :date_for_input}", :readonly => true, :class => 'datepicker input-small'
-    = label_tag :start, "To", :class => "control-label"
+    = label_tag :stop, "To", :class => "control-label"
     = text_field_tag :stop, "#{l @search.stop, :format => :date_for_input}", :readonly => true, :class => 'datepicker input-small'
     .pull-right
       = submit_tag "Search", :class => "btn"
@@ -19,7 +19,7 @@
           %th Order
           %th Time
           %th Person
-          %th Amount
+          %th Total Contribution
           %th Non-deductible
       %tbody
         - @search.results.each do |order|

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

@@ -3,38 +3,8 @@
   %h1 Record Contribution
 
 .row
-  .span8.offset2
-    %h4= link_to "#{@contribution.contributor.first_name} #{@contribution.contributor.last_name}", person_path(@contribution.contributor)
-    %h4= @contribution.contributor.email
-    .hr
-    - if current_user.current_organization.has_active_fiscally_sponsored_project?
-      %p Use this form for recording contributions received outside of Fractured Atlas.  Donations to Fractured Atlas Fiscally Sponsored Projects should be made through Fractured Atlas.
-      %p Please contact support with any questions.
-      
-    %hr
-  
-    = form_for(@contribution, :url => contributions_path, :html=>{ :class=>'form-horizontal' }) do |form|
-      = form.hidden_field :person_id
-      = form.hidden_field :organization_id
-      .control-group
-        = form.label :subtype, "Type", :class => 'control-label'
-        .controls
-          = form.select :subtype, options_for_select(Action::GIVE_TYPES)
-        
-      .control-group
-        = form.label :amount, "Dollar Value", :class => 'control-label'
-        .controls      
-          = form.text_field :amount, :class => :currency
-        
-      .control-group
-        = form.label :occurred_at, "Date and Time", :class => 'control-label'
-        .controls  
-          = form.text_field :occurred_at, :value => l(Time.now, :format => :datetime_for_input), :readonly => true, :class => :datetimepicker
-          
-      .control-group
-        = form.label :details, "Notes", :class => 'control-label'
-        .controls 
-          = form.text_field :details
-      .form-actions
-        = submit_tag "Save", :class => "btn"
-        = link_to "Cancel", person_path(@contribution.person_id), :class => "btn"
+  .span3  
+    =render :partial => "sidebar", :locals => {:contribution => @contribution}
+    
+  .span9
+    =render :partial => "form", :locals => {:contribution => @contribution, :cancel_path => person_path(@contribution.person_id)}

data/app/views/discounts/_discount_section_fields.html.haml

@@ -0,0 +1,25 @@
+.fields.section-fields.discount-tickets
+  .control-group
+    =f.label :section_id, "Ticket Type", :class => 'control-label'
+    .controls
+      :ruby
+        # this should probably go in a helper
+        sections = @event.charts.collect(&:sections).flatten.uniq
+        sections_options = sections.map {|s| content_tag('option', s.name, {:value => s.id.to_s, 'data-price' => (s.price / 100.0)}) }
+
+      = f.select :section_id, sections_options.join('').html_safe, {}, :class => 'section-select'
+
+      - show_remove_links = true if show_remove_links.nil?
+      - if show_remove_links
+        %span.remove-fields-link
+          = f.hidden_field :_destroy
+          %i.icon-minus-sign.icon-gray
+          = link_to_remove_fields "remove Ticket Type", f
+
+  .control-group.custom-discount-price{:style => 'display:none;'}
+    =f.label :price, "Discounted price", :class => 'control-label'
+    .controls
+      .input-prepend
+        %span.add-on $
+        =f.text_field :price, :placeholder => '0.00', :class => 'input-small section-price'#, :value => number_as_cents(f.object.price, :format => "%n")
+      (regularly <span class="regular-price">#{number_to_currency(sections.first.price)}</span>)