artfully_ose 1.2.0.pre.4 → 1.2.0.pre.5

data/app/controllers/events_controller.rb

@@ -23,7 +23,7 @@ class EventsController < ArtfullyOseController
 
   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
@@ -52,7 +52,7 @@ class EventsController < ArtfullyOseController
   def edit
     authorize! :edit, @event
   end
-  
+
   def image
     authorize! :edit, @event
   end
@@ -103,28 +103,10 @@ class EventsController < ArtfullyOseController
 
   def wp_plugin
   end
-  
-  def prices
-  end
 
-  def temp_discounts_index
-    find_event
+  def prices
   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
 

data/app/controllers/memberships_controller.rb

@@ -3,6 +3,7 @@ class MembershipsController < ArtfullyOseController
 
   def index
     @person = Person.find(params[:person_id])
+    @membership_types = current_organization.membership_types
   end
 
   def bulk_update

data/app/controllers/organizations_controller.rb

@@ -22,7 +22,7 @@ class OrganizationsController < ArtfullyOseController
       flash[:error] = "You can only join one organization at this time."
       redirect_to organizations_url
     end
-    
+
     if Organization.all.length > 0
       flash[:error] = "There is already an organization created for this installation."
     end
@@ -35,7 +35,7 @@ class OrganizationsController < ArtfullyOseController
       flash[:error] = "There is already an organization created for this installation."
       redirect_to new_organization_path and return
     end
-    
+
     @organization = Organization.new(params[:organization])
 
     if @organization.save
@@ -61,5 +61,5 @@ class OrganizationsController < ArtfullyOseController
     else
       render :show
     end
-  end   
+  end
 end

data/app/controllers/store/events_controller.rb

@@ -2,9 +2,11 @@ class Store::EventsController < Store::StoreController
   def show
     session[:last_event_id] = params[:id]
     @event = Event.storefront_find(params[:id], current_member)
+    render (@event.single_show? ? :single_show : :show)
   end
 
   def index
     @events = Event.for_storefront(@store_organization, current_member)
+    @events = []
   end
 end

data/app/helpers/artfully_ose_helper.rb

@@ -42,6 +42,12 @@ module ArtfullyOseHelper
     "#{time_ago_in_words(t)} #{qualifier}"
   end
 
+  def clean_full_error_messages(errors)
+    string = errors.full_messages.collect {|m| m.downcase.gsub(/.*organization/, 'organization')}.to_sentence
+    string = string.slice(0,1).capitalize + string.slice(1..-1)
+    string = string + "."
+  end
+
   #
   # For use with the nav-pills to select an intem based on a current selection
   # Will protect against nil by using try on the object

data/app/models/action.rb

@@ -1,7 +1,7 @@
 class Action < ActiveRecord::Base
   include OhNoes::Destroy
   
-  belongs_to :person
+  belongs_to :person, touch: true
   belongs_to :creator, :class_name => "User", :foreign_key => "creator_id"
   belongs_to :organization
   belongs_to :subject, :polymorphic => true

data/app/models/event.rb

@@ -68,16 +68,14 @@ class Event < ActiveRecord::Base
     update_attribute(:deleted_at, Time.now)
   end
 
-  def self.for_storefront(organization, member = nil)
-    event_rel = Event.joins(:shows).where(:organization_id => organization.id).where('shows.datetime > ?', DateTime.now).group(:event_id).public
-    event_rel = event_rel.where(:members_only => false) if member.nil?
-    event_rel.all
+  def single_show?
+    shows.length == 1
   end
 
-  def self.storefront_find(id, member = nil)
-    event_rel = Event.includes(:venue, :shows => [:chart => [:sections => :ticket_types]])
+  def self.for_storefront(member = nil)
+    event_rel = Event.joins(:shows).where(:organization_id => organization.id).where('shows.datetime > ?', DateTime.now).group(:event_id).public
     event_rel = event_rel.where(:members_only => false) if member.nil?
-    event_rel.find(id)
+    event_rel.all
   end
   
   def destroyable?

data/app/models/kit.rb

@@ -28,8 +28,6 @@ class Kit < ActiveRecord::Base
       event(:activate_without_pending) { transitions :from => [:fresh, :pending, :cancelled], :to => :activated }
     end
 
-    
-
     if self.requires_approval
       state_machine do
         event(:submit_for_approval) { transitions :from => :fresh, :to => :pending }
@@ -39,7 +37,7 @@ class Kit < ActiveRecord::Base
     class_eval(&block)
     self
   end
-  
+
   def self.activate(options)
     activation_requirements[:unless] << options.delete(:unless) if options.has_key?(:unless)
     activation_requirements[:if] << options.delete(:if) if options.has_key?(:if)

data/app/models/membership.rb

@@ -20,7 +20,7 @@ class Membership < ActiveRecord::Base
     membership_award.people.each do |people|
       Rails.logger.debug("                              MEMBERSHIP FOR #{people}")
       membership              = Membership.for(membership_award.membership_type)
-      membership.ends_at      = membership_Award.ends_at
+      membership.ends_at      = membership_award.ends_at
       membership.sold_price   = membership_award.sold_price
 
       # create order
@@ -38,7 +38,7 @@ class Membership < ActiveRecord::Base
   end
 
   def cart_price
-    price 
+    price
   end
 
   def self.realized_fee
@@ -61,4 +61,4 @@ class Membership < ActiveRecord::Base
     self.membership_type.name
   end
 
-end
+end

data/app/models/membership_award.rb

@@ -11,6 +11,7 @@ class MembershipAward
                 :ends_at, 
                 :message, 
                 :send_email,
+                :notes,
                 :sold_price
 
   def persisted?

data/app/models/note.rb

@@ -1,7 +1,7 @@
 class Note < ActiveRecord::Base
   attr_accessible :occurred_at, :text
   
-  belongs_to :person
+  belongs_to :person, touch: true
   belongs_to :user
   belongs_to :organization
 end

data/app/models/order_handler.rb

@@ -37,7 +37,6 @@ class OrderHandler
         @discount = nil
         self.cart.tickets.each do |ticket|
           @discount = Discount.find_by_code_and_event_id(params[:discount].upcase, ticket.show.event.id)
-          Rails.logger.debug(">>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>> #{@discount}")
           unless @discount.nil?
             @discount.apply_discount_to_cart(self.cart)
             break
@@ -64,7 +63,7 @@ class OrderHandler
     if params[:donation_amount]
       self.cart.clear_donations
       if params[:donation_amount].to_i == 0
-        flash[:error] = "Please enter a donation amount."
+        self.error = "Please enter a donation amount."
         return
       end
       

data/app/models/organization.rb

@@ -3,9 +3,9 @@ class Organization < ActiveRecord::Base
   include Valuation::LifetimeFees
   include Ext::Resellable::Organization
   include Ext::Integrations::Organization
-  
-  attr_accessible :name, :time_zone, :ein, :legal_organization_name, :email, :receive_daily_sales_report
-  
+
+  attr_accessible :name, :time_zone, :ein, :legal_organization_name, :email, :receive_daily_sales_report, :country, :state, :zip, :phone_number, :website, :discipline
+
   has_many :events
   has_many :charts
   has_many :shows
@@ -29,7 +29,7 @@ class Organization < ActiveRecord::Base
 
   has_many :imports
 
-  validates_presence_of :name, :email
+  validates_presence_of :name, :email, :time_zone, :country, :state, :zip, :phone_number, :discipline
   validates :ein, :presence => true, :if => :updating_tax_info
   validates :legal_organization_name, :presence => true, :if => :updating_tax_info
 
@@ -40,7 +40,6 @@ class Organization < ActiveRecord::Base
     self.id
   end
 
-
   #
   # We aren't interested in FAFS donations, so override lifetime_orders
   # to only include Artfully orders  see: Valuation::LifetimeValue
@@ -56,7 +55,7 @@ class Organization < ActiveRecord::Base
   # But those methods have not been added to a release yet.
   #
   def tags_for(tagged_association)
-    
+
     #Yak
     begin
       self.send(tagged_association.to_sym)
@@ -65,7 +64,7 @@ class Organization < ActiveRecord::Base
     end
 
     table_name = Kernel.const_get(tagged_association.to_s.classify).table_name
-    
+
     ActsAsTaggableOn::Tag.joins("INNER JOIN taggings ON tags.id = taggings.tag_id")
                          .joins("INNER JOIN #{table_name} ON #{table_name}.id = taggings.taggable_id")
                          .joins("INNER JOIN organizations ON organizations.id = #{table_name}.organization_id")
@@ -128,7 +127,7 @@ class Organization < ActiveRecord::Base
   def has_kit?(name)
     kits.where(:state => "activated").map(&:class).map(&:name).include?(name.to_s.camelize + "Kit")
   end
-  
+
   private
 
     def check_for_duplicates(kit)

data/app/models/user.rb

@@ -11,6 +11,8 @@
   has_many :user_memberships
   has_many :organizations, :through => :user_memberships
 
+  accepts_nested_attributes_for :user_memberships
+
   scope :logged_in_more_than_once, where("users.sign_in_count > 1")
 
   def self.generate_password
@@ -18,20 +20,20 @@
   end
 
   # Setup accessible (or protected) attributes for your model
-  attr_accessible :email, :password, :password_confirmation, :remember_me, :user_agreement, :newsletter_emails
+  attr_accessible :email, :password, :password_confirmation, :remember_me, :user_agreement, :newsletter_emails, :first_name, :last_name, :user_memberships_attributes
 
   def is_in_organization?
-    @is_in_organization ||= user_memberships.any?
+    !!(user_memberships.any? && ! user_memberships.first.organization.new_record?)
   end
 
   def current_organization
-    @current_organization ||= (is_in_organization? ? user_memberships.first.organization : Organization.new)
+    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}%"
@@ -44,4 +46,14 @@
   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,10 +1,11 @@
 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
-  
+  attr_accessible :user, :organization_attributes
+
   belongs_to :user
   belongs_to :organization
 
+  accepts_nested_attributes_for :organization
+
   validates :user_id, :uniqueness => {:scope => :organization_id}
 end

data/app/views/imports/people/_new.html.haml

@@ -19,10 +19,10 @@
         %td.field-slim Email
         %td="The email address of the person. People records in Artful.ly have unique email addresses, so if you're importing an email address that has already been assigned to a person, we'll merge the data for you. #{link_to "Read more", "#merging", {'data-toggle' => 'modal'}}".html_safe
       %tr
-        %td.field-slim First 
+        %td.field-slim First Name
         %td The first name of the person.
       %tr 
-        %td.field-slim Last
+        %td.field-slim Last Name
         %td The last name of the person.
       %tr
         %td.field-slim Company Name
@@ -36,7 +36,7 @@
         %td.field-slim Salutation
         %td The person's salutation (Mr., Mrs., etc...)
       %tr
-        %td.field-slim Middle
+        %td.field-slim Middle Name
         %td The person's middle name
       %tr
         %td.field-slim Suffix
@@ -45,10 +45,10 @@
         %td.field-slim Title
         %td The person's title in the company
       %tr
-        %td.field-slim Address1
+        %td.field-slim Address 1
         %td First line of the person's address
       %tr
-        %td.field-slim Address2
+        %td.field-slim Address 2
         %td Second line of the person's address
       %tr
         %td.field-slim City

data/app/views/layouts/_flash.html.haml

@@ -2,4 +2,4 @@
   - if flash[type]
     .flash{ "data-alert" => "alert", :class => [bootstrapped_type(type), type, 'alert'] }
       .close{ "data-dismiss" => "alert"} ×
-      = flash[type]  
+      = flash[type]

data/app/views/layouts/application.html.haml

@@ -1,5 +1,5 @@
-!!!
-%html{:xmlns => "http://www.w3.org/1999/xhtml", "xml:lang" => "en", :lang => "en", "ng-app" => "artfully"}
+!!! 5
+%html{:lang => "en", "ng-app" => "artfully"}
   %head
     %title= "#{yield :title} : #{t 'artfully.page_title'}"
     :plain

data/app/views/layouts/devise_layout.html.haml

@@ -1,5 +1,5 @@
-!!!
-%html{:xmlns => "http://www.w3.org/1999/xhtml", "xml:lang" => "en", :lang => "en"}
+!!! 5
+%html{:lang => "en", "ng-app" => "artfully"}
   %head
     %title= "#{yield :title} : Artful.ly"
     %link{ :rel => "shortcut icon", :href => "/favicon.ico", :type => "image/x-icon"}

data/app/views/membership_awards/confirm.html.haml

@@ -31,10 +31,44 @@
           %td Email Preview
           %td=link_to "Preview Now", "#email-preview", 'data-toggle' => 'modal'
 
+    - if @membership_award.people.length == 1
+      %h3 Payment
+      .row-fluid
+        .span5
+          #payment-controls.controls
+            %label.radio
+              = radio_button_tag(:payment_method, :cash, true, :class => 'payment-method', :humanized_value => 'Cash')
+              Cash
+            %label.radio
+              = radio_button_tag(:payment_method, :comp, false, :class => 'payment-method', :disabled => 'true', :humanized_value => 'Comp')
+              Comp
+            %label.radio
+              = radio_button_tag(:payment_method, :credit_card_manual, false, :class => 'payment-method', :humanized_value => 'Credit card')
+              Credit
+        .span7
+          #payment-info.hidden.well
+            .control-group
+              = label_tag("credit_card[cardholder_name]", "Name on Card")
+              .controls= text_field_tag("credit_card[name]", params[:cardholder_name])
+            .control-group
+              = label_tag("credit_card[card_number]", "Card Number")
+              .controls= text_field_tag("credit_card[number]", params[:card_number])
+            .control-group
+              = label_tag("credit_card[expiration_date]", "Expiration Date")
+              .date_field.controls
+                = select_tag("credit_card[month]", options_for_select(1..12, params["month"]), :class => 'input-small inline')
+                = select_tag("credit_card[year]", options_for_select(Time.now.year..Time.now.year + 10, params["year"]), :class => 'input-small inline')
+
     %h3 What Happens Now?
-    %p These people will become members of your organization. 
+    %p 
+      =check_mark
+      These people will become members of your organization. 
+    %p 
+      =check_mark
+      The credit card you provided will be charged . 
     -if @membership_award.send_email
       %p 
+        =check_mark
         They will get an email to setup an account with your orgnaization if they have not already done so.
         =link_to "Click here to see a preview of this email", "#email-preview", 'data-toggle' => 'modal'
 
@@ -56,4 +90,16 @@
       .modal-body
         =@membership_award.message
       .modal-footer
-        %button.btn{'data-dismiss'=>'modal'} Close
+        %button.btn{'data-dismiss'=>'modal'} Close
+
+-content_for :custom_js do
+  :javascript
+    $(".payment-method").change(function(){
+      if($(this).attr('value') != 'credit_card_manual'){
+        $("#payment-info").addClass("hidden");
+        $("#credit_card_number").val("")
+        $("#credit_card_name").val("")
+      } else {
+        $("#payment-info").removeClass("hidden");
+      }
+    });