artfully_ose 1.2.0.pre.9 → 1.2.0.pre.10

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    MGVjMmI2YmJlZWYwYjExYjE4MjhhNjUxNzRjMWNhM2U4ZGQ4ZmY1YQ==
+    ZjU5MDg5NmVkZGE5NjhmMGRhZjczMzA1YzE3ZWU4ODJhNWE3NzUwYw==
   data.tar.gz: !binary |-
-    NGI3YjdjMTg2ODgwMzk1MDg4MjkzMjIyOTdkYzFhM2JiZWIwZjI0Yg==
+    NjczZTg0N2QzODRiMmJhNDAyMTg2ODgzZmRiMjYzOWU5MWE3ZTNmNw==
 !binary "U0hBNTEy":
   metadata.gz: !binary |-
-    NjZhZWRlOTRlMDQxNjdhNzVmMmUyOTUwYTc3MTZmZjYwYmM2MjYzYWJlZWEy
-    ZjZkMzAwN2M4NTc3YTc1MjE5ZTU4YjhlZWNhY2ZjNzIyMTNiMDc3NWM2ZjUx
-    MDNiNjZmZTMwM2U2NmJkZTZiNmU4NmJlYjkzYzNmNTgwM2EyODE=
+    NzA4NzVlZWI2MmY5YjAzYzIxOTAzMTJiZjVmNmZkNTRkNGM4NzM1OWNkMDRk
+    NjM0NmYyMzJiODFjNDIyZTUxOWY5MDllOWQwN2Y0NzBiZjAzYzI0NTUwMWMw
+    MDgwODk1ZjM3NWE4ZjBmMDliOTZmODBjM2M1NTBmYzM5ZDBhMmQ=
   data.tar.gz: !binary |-
-    YTA5YTgwODY5MDdlMjljOWU0YTc4ZWJlZDU0YTc0ODFkOTUzMWFlZmM5Nzk3
-    MTg5ZDYyMGExOGE1YzU2NGI4YjU4YzA5MmVhZmUxNWE5NzJjMDg3YTAzOTQ5
-    MzE0MzBiMzE2NDAwZGFjYTNjZjBmMDMyZGQ0ZTAyOTBhMDIyNzI=
+    YjJjYWY1NWNhMmE3ZWM1YjBlYzZjYmQxNDczODAwZmEyYzc5NjM4YzI2OTRm
+    MmRkN2JlNDgyZTE0MWEyNzRhMjBmZWY2NGU2OTU0YWNmMjhlOThkNDQzZGYx
+    NTMyMWE3ZWExYTg4NzI3MTM4YmE4OGNiZThkNjJlZmIzMTIxNzk=

data/app/assets/javascripts/application.js

@@ -207,8 +207,8 @@ $(document).ready(function() {
   });
 
   $(document).locationSelector({
-    'countryField' : '#user_user_memberships_attributes_0_organization_attributes_country',
-    'regionField'  : '#user_user_memberships_attributes_0_organization_attributes_state'
+    'countryField' : '#user_organization_country',
+    'regionField'  : '#user_organization_state'
   });
 
   $(document).locationSelector({
@@ -523,7 +523,12 @@ function activateControls() {
     });
   });
 
+  $(".datepicker-alt-field" ).datepicker({
+    dateFormat: 'yy-mm-dd',
+    altField: '#ends_at'
+  });
   $(".datepicker" ).datepicker({dateFormat: 'yy-mm-dd'});
+
 	if (!Modernizr.inputtypes.date) {
 		$('input[type="date"]').datepicker({
       dateFormat: 'yy-mm-dd'

data/app/controllers/artfully_ose_controller.rb

@@ -1,10 +1,12 @@
 class ArtfullyOseController < ActionController::Base
+  include Ext::Integrations::ArtfullyOseController
 
   protect_from_forgery
 
   before_filter :authenticate_user!
   layout :specify_layout
   after_filter :set_csrf_cookie_for_angular
+  before_filter :require_more_info
 
   delegate :current_organization, :to => :current_user
 
@@ -75,4 +77,17 @@ class ArtfullyOseController < ActionController::Base
     def set_csrf_cookie_for_angular
       cookies['XSRF-TOKEN'] = form_authenticity_token if protect_against_forgery?
     end
+
+    def require_more_info
+      if need_more_info?
+        flash[:info] = "We need to collect more information about your organization before you continue."
+        redirect_to collect_info_signups_path
+      end
+    end
+
+    def keep_page_from_caching
+      response.headers["Cache-Control"] = "no-cache, no-store, max-age=0, must-revalidate"
+      response.headers["Pragma"] = "no-cache"
+      response.headers["Expires"] = "Fri, 01 Jan 1990 00:00:00 GMT"
+    end
 end

data/app/controllers/store/memberships_controller.rb

@@ -1,5 +1,5 @@
 class Store::MembershipsController < Store::StoreController
   def index
-    @membership_types = store_organization.membership_types.on_sale
+    @membership_types = store_organization.membership_types.storefront
   end
 end

data/app/models/ext/integrations.rb

@@ -2,11 +2,14 @@ module Ext
   module Integrations
     module Member
     end
-    
+
     module User
+      def need_more_info?
+        false
+      end
     end
-    
-    module Kit      
+
+    module Kit
       def record_activation
       end
 
@@ -24,11 +27,11 @@ module Ext
                      .includes(:sections => :ticket_types)
                      .where('shows.id = ?', self.id)
                      .where("ticket_types.#{channel} = ?", true)
-       
+
         chart.first
       end
     end
-    
+
     module Organization
       def self.included(base)
         base.class_eval do
@@ -42,11 +45,11 @@ module Ext
           end
         end
       end
-      
+
       def connected?
         false
-      end 
-      
+      end
+
       def fsp
         nil
       end
@@ -69,37 +72,37 @@ module Ext
       def name_for_donations
         self.name
       end
-      
+
       def update_kits
       end
 
       def sponsored_kit
         nil
       end
-      
+
       def shows_with_sales
         raise "Just use shows"
       end
     end
-    
+
     module Order
       def self.included(base)
         base.extend ClassMethods
       end
-      
+
       def fa_id
         nil
       end
-      
+
       module ClassMethods
-        def sale_search(search)        
+        def sale_search(search)
           standard = ::Order.includes(:items => { :show => :event })
 
-          if search.start   
+          if search.start
             standard = standard.after(search.start)
           end
 
-          if search.stop   
+          if search.stop
             standard = standard.before(search.stop)
           end
 
@@ -115,7 +118,7 @@ module Ext
 
           standard.all
         end
-      end     
+      end
     end
 
     module Ticket
@@ -128,17 +131,24 @@ module Ext
       def record_comp
       end
     end
-    
+
     module Event
       def shows_with_sales(seller)
         raise "Just use shows"
       end
     end
-    
+
     module Item
       def settlement_issued?
         false
       end
     end
+
+    module ArtfullyOseController
+      def need_more_info?
+        current_user.try(:need_more_info?)
+      end
+      private :need_more_info?
+    end
   end
 end

data/app/models/import.rb

@@ -73,9 +73,9 @@ class Import < ActiveRecord::Base
   #
   # This composes errors thrown *during* the import.  For validation errors, see invalidate!
   #
-  def fail!(error = nil, row = nil, row_num = 0)
+  def fail!(error, row = nil, row_num = 0)
     Rails.logger.error "IMPORT ERROR [#{self.id}]: #{error.message}"
-    error.backtrace.each { |line| Rails.logger.error "     #{line}" }
+    error.backtrace.each { |line| Rails.logger.error "     #{line}" } if error.backtrace 
     self.import_errors.create! :row_data => row, :error_message => "Row #{row_num}: #{error.message}"
     failed!
     rollback
@@ -169,24 +169,23 @@ class Import < ActiveRecord::Base
     person.skip_commit = true
     person
   end
-  
+
   def create_person(parsed_row)
-    Rails.logger.info("Import #{id} DONATION_IMPORT: Creating person")
-    if !parsed_row.email.blank?
-      person = Person.first_or_create({:email => parsed_row.email, :organization => self.organization}.merge(parsed_row.person_attributes), {}) do |p|
-        p.import = self
-      end
-    else    
-      person = attach_person(parsed_row)
-      if !person.save
-        Rails.logger.info("Import #{id} DONATION_IMPORT: Person save failed")
-        self.import_errors.create! :row_data => parsed_row.row, :error_message => person.errors.full_messages.join(", ")
-        self.reload
-        fail!
-      end 
-    end
-    person  
-  end
+   if !attach_person(parsed_row).naming_details_available?
+     person = self.organization.dummy
+   elsif !parsed_row.email.blank?
+     person = Person.first_or_create({:email => parsed_row.email, :organization => self.organization}.merge(parsed_row.person_attributes), {}) do |p|
+       p.import = self
+     end
+   else    
+     person = attach_person(parsed_row)
+     if !person.save
+       self.reload
+       fail!(RowError.new(person.errors.full_messages.join(", ")), parsed_row.row)
+     end 
+   end
+   person  
+ end
 
   class RowError < ArgumentError
   end

data/app/models/job/mailchimp_sync_job.rb

@@ -33,10 +33,8 @@ class MailchimpSyncJob < Struct.new(:mailchimp_kit, :options)
     mailchimp_kit.sync_merged_winner_to_mailchimp(options[:winner_id], options[:new_lists])
   end
 
-  #
-  # Noop.  We don't respond to this yet.
-  #
   def webhook_cleaned
+    mailchimp_kit.sync_mailchimp_webhook_cleaned(list_id, data)
   end
 
   def webhook_subscribe

data/app/models/kits/mailchimp_kit.rb

@@ -253,6 +253,16 @@ class MailchimpKit < Kit
     person
   end
 
+  def sync_mailchimp_webhook_cleaned(list_id, data)
+    person = organization.people.find_by_email(data["email"])
+    return if person.nil?
+
+    reason = (data["reason"] == "hard" ? "a hard bounce" : "abuse")
+    person.subscribed_lists.delete(list_id)
+    person.new_note("MailChimp cleaned #{person.email} from #{list_name(list_id)} because of #{reason}.", Time.now, nil, organization_id)
+    puts person.save
+  end
+
   def sync_mailchimp_webhook_update_person_email(list_id, data)
     person = organization.people.find_by_email(data["old_email"])
     return if person.nil? || person.do_not_email?
@@ -277,12 +287,7 @@ class MailchimpKit < Kit
   def sync_mailchimp_webhook_member_unsubscribe(list_id, data)
     person = organization.people.find_by_email(data["email"])
     return unless person
-    note = person.notes.build({
-      :text => "Unsubscribed in MailChimp from #{list_name(list_id)}",
-      :occurred_at => Time.now
-    })
-    note.organization_id = organization_id
-    note.save
+    person.new_note("Unsubscribed in MailChimp from #{list_name(list_id)}", Time.now, nil, organization_id)
     person.subscribed_lists.delete(list_id)
     person.save
   end

data/app/models/membership_type.rb

@@ -1,7 +1,7 @@
 class MembershipType < ActiveRecord::Base
   attr_accessible :name, :price, :fee, :number_of_shows, 
                   :plan, :on_sale, :description, :ends_at, 
-                  :starts_at, :duration, :type, :period, :number_of_tickets
+                  :starts_at, :duration, :type, :period, :number_of_tickets, :sales_start_at, :sales_end_at
 
   belongs_to :organization
   has_many :memberships
@@ -11,6 +11,8 @@ class MembershipType < ActiveRecord::Base
   after_create :create_list_segment
   
   default_scope order("created_at DESC")
+
+  scope :storefront, where(:on_sale => true).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 :on_sale, where(:on_sale => true)
 
   def membershipize

data/app/models/organization.rb

@@ -23,7 +23,7 @@ class Organization < ActiveRecord::Base
   has_many :members
   has_many :searches
 
-  has_many :users, :through => :user_memberships
+  has_many :users, :through => :user_memberships, :order => 'user_memberships.owner desc'
   has_many :kits, :before_add => :check_for_duplicates,
                   :after_add => lambda { |u,k| k.activate! unless k.activated? }
 
@@ -52,7 +52,7 @@ class Organization < ActiveRecord::Base
   # Returns Tag objects.  For an array of tag strings, call unique_tag_strings_for
   #
   # This has been supersceded by tags_on and tag_counts_on in acts_as_taggable_on
-  # But those methods have not been added to a release yet.
+  # But those methods have not been added to an acts_as_taggable_on release yet.
   #
   def tags_for(tagged_association)
 
@@ -75,8 +75,19 @@ class Organization < ActiveRecord::Base
     self.tags_for(tagged_association).all.map(&:name).uniq
   end
 
+  #
+  # Will promote user to owner and demote any other owners
+  #
+  def make_owner(user)
+    UserMembership.promote(user, self)
+  end
+
+  def previous_owner
+    users.order('user_memberships.id asc').first
+  end
+
   def owner
-    users.first
+    @owner ||= UserMembership.includes(:user).where(:organization_id => self.id).where(:owner => true).first.try(:user)
   end
 
   def dummy

data/app/models/person.rb

@@ -364,7 +364,7 @@ class Person < ActiveRecord::Base
       :text => text,
       :occurred_at => Time.now
     })    
-    note.user_id = user.id
+    note.user_id = user.id if user
     note.organization_id = organization_id
     note.save
     note

data/app/models/ticket_summary.rb

@@ -14,14 +14,17 @@ class TicketSummary
   end
   
   class TicketSummary::Row
-    attr_accessor :show, :tickets
+    attr_accessor :show, :tickets, :ticket_type_hash
     
     def initialize
       @tickets = []
+      @ticket_type_hash = {}
     end
     
     def <<(ticket)
       @tickets << ticket
+      @ticket_type_hash[ticket.ticket_type] ||= []
+      @ticket_type_hash[ticket.ticket_type] << tickets
       @show = ticket.show
       self
     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
@@ -11,8 +11,6 @@
   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

data/app/models/user_membership.rb

@@ -8,4 +8,20 @@ class UserMembership < ActiveRecord::Base
   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.owner  = true
+      return @user_membership.save
+    end
+  end
 end

data/app/views/events/_ticket_type_fields.html.haml

@@ -31,6 +31,8 @@
       =f.label :description, "Description", :class => 'control-label'
       .controls
         =f.text_area :description, :class => 'span4', :size => '10x2'
+        %p.muted
+          This description will appear on your storefront as well as on patron receipts.
     
     .control-group
       =f.label :availablity, "Availablity", :class => 'control-label'

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

@@ -25,6 +25,14 @@
 
     =render "membership_types/#{@membership_type.class.name.underscore}_form", :f => f
 
+    .control-group
+      = f.label :fee, "Sales Start", :class => 'control-label'
+      .controls
+        = f.text_field :sales_start_at, :value => "#{l @membership_type.sales_start_at, :format => :date_for_input}", :class => :datepicker
+    .control-group
+      = f.label :fee, "Sales End", :class => 'control-label'
+      .controls
+        = f.text_field :sales_end_at, :value => "#{l @membership_type.sales_end_at, :format => :date_for_input}", :class => :datepicker
 
     .control-group
       = f.label :on_sale, "On Sale", :class => 'control-label checkbox' 
@@ -36,4 +44,4 @@
 
 -content_for :custom_js do
   :javascript
-    touchCurrency();
+    $(document).ready(function() { touchCurrency(); })

data/app/views/membership_types/_seasonal_membership_type_form.html.haml

@@ -1,8 +1,8 @@
 .control-group
   = f.label :starts_at, "Mebership Begins", :class => 'control-label'
   .controls
-    = f.text_field :starts_at, :class => :datepicker
+    = f.text_field :starts_at, :value => "#{l @membership_type.starts_at, :format => :date_for_input}", :class => :datepicker
 .control-group
   = f.label :ends_at, "Membership Ends", :class => 'control-label'
   .controls
-    = f.text_field :ends_at, :class => :datepicker
+    = f.text_field :ends_at, :value => "#{l @membership_type.ends_at, :format => :date_for_input}", :class => :datepicker

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

@@ -13,7 +13,7 @@
     %th.right Tickets
     %th.right Price
     %th.right Fee
-    %th.right On Sale
+    %th.right On Storefront
   -@membership_types.each do |membership_type|
     %tr
       %td=link_to membership_type.name, edit_membership_type_path(membership_type)

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

@@ -56,7 +56,8 @@
           .control-group
             %label Change the expiration of these memberships to:
             .controls
-              =text_field_tag "ends_at", "", :class => "datepicker"
+              .datepicker-alt-field
+              =hidden_field_tag "ends_at", ""
         .modal-footer
           =submit_tag "Change Expiration", :class => "btn btn-success"
           =link_to "Cancel", "#", :class => "btn btn-danger", 'data-dismiss'=>'modal' 

data/app/views/order_mailer/confirmation_for.html.haml

@@ -17,15 +17,11 @@
   = "Service fee: $#{format("%.2f", (@order.service_fee.to_i/100.0))}"
   %br
 
-%p="==================="
-
 - unless @order.tickets.empty?
-  %h4 Tickets
   - @order.ticket_summary.rows.each do |row|
     %p
-      =row.show.event.name
-      %br
-      =l row.show.datetime_local_to_event
+      %h4=row.show.event.name
+      =l row.show.datetime_local_to_event, :format => :long_with_day
       %br
       -unless row.show.event.contact_email.blank?
         ="Event contact email: #{row.show.event.contact_email}"
@@ -33,19 +29,20 @@
       -unless row.show.event.contact_phone.blank?
         ="Event contact phone: #{row.show.event.contact_phone}"
         %br
-      %br
-      ="#{row.show.event.venue.name}"
-      %br
-      -unless row.show.event.venue.street_as_string.blank?
-        ="#{row.show.event.venue.street_as_string}" 
-        %br
-      -unless row.show.event.venue.city_state_zip_as_string.blank?  
-        ="#{row.show.event.venue.city_state_zip_as_string}"
-        %br
-    %ul.ticket-list
-      - row.tickets.each do |ticket|
-        %li
-          %span.price= "#{ticket.ticket_type.name}: $#{format("%.2f", (ticket.price/100.0))}"
+    -row.ticket_type_hash.keys.each do |ticket_type|
+      %ul.ticket-list
+        -ticket_type.tickets.each do |ticket|
+          %li
+            %span.price= "#{ticket.ticket_type.name}: $#{format("%.2f", (ticket.sold_price/100.0))}"
+        %li{:style => 'list-style-type:none'}=ticket_type.description
+
+    =link_to image_tag("https://maps.google.com/maps/api/staticmap?size=240x140&maptype=roadmap&markers=color:red|#{row.show.event.venue.address_as_url_query}&sensor=false&zoom=15"), "https://maps.google.com/maps?q=#{row.show.event.venue.address_as_url_query.html_safe}&z=15"
+    %div
+      %strong=row.show.event.venue.name
+    %div=row.show.event.venue.address1
+    -unless row.show.event.venue.address2.blank?
+      %div=row.show.event.venue.address2
+    %div=row.show.event.venue.city_state_zip_as_string
 
 - unless @order.donations.empty?
   %h4 Donations
@@ -54,3 +51,4 @@
       %li
         %span.price= "$#{format("%.2f", (item.price/100.00))}:"
         %span.name= "Donation to #{@order.organization.name_for_donations}"
+

data/app/views/order_mailer/confirmation_for.text.haml

@@ -27,9 +27,12 @@ Order confirmation
     -unless row.show.event.venue.street_as_string.blank?
       ="#{row.show.event.venue.street_as_string}" 
     -unless row.show.event.venue.city_state_zip_as_string.blank?  
-      ="#{row.show.event.venue.city_state_zip_as_string}"
-    - row.tickets.each do |ticket|
-      = "- #{ticket.ticket_type.name}: $#{format("%.2f", (ticket.price/100.0))}"
+      ="#{row.show.event.venue.city_state_zip_as_string}"    
+
+    -row.ticket_type_hash.keys.each do |ticket_type|
+      -ticket_type.tickets.each do |ticket|
+        = "#{ticket.ticket_type.name}: $#{format("%.2f", (ticket.sold_price/100.0))}"
+      =ticket_type.description
 
 
 

data/db/migrate/20131023200559_add_admin_to_user_memberships.rb

@@ -0,0 +1,14 @@
+class AddAdminToUserMemberships < ActiveRecord::Migration
+  def change
+    add_column :user_memberships, :owner, :boolean, :default => 0
+
+    Organization.find_each(:include => :users) do |organization|
+      if organization.users.empty?
+        puts "Organization [#{organization.id}] has no owner"
+      else
+        puts "#{organization.id},#{organization.users.first.id}"
+        organization.make_owner(organization.previous_owner)
+      end
+    end
+  end
+end

data/db/migrate/20131029173612_add_sales_start_to_membership_typ.rb

@@ -0,0 +1,6 @@
+class AddSalesStartToMembershipTyp < ActiveRecord::Migration
+  def change
+    add_column :membership_types, :sales_start_at, :datetime
+    add_column :membership_types, :sales_end_at, :datetime
+  end
+end

data/lib/artfully_ose/version.rb

@@ -1,3 +1,3 @@
 module ArtfullyOse
-  VERSION = "1.2.0.pre.9"
+  VERSION = "1.2.0.pre.10"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: artfully_ose
 version: !ruby/object:Gem::Version
-  version: 1.2.0.pre.9
+  version: 1.2.0.pre.10
 platform: ruby
 authors:
 - Artful.ly
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-10-15 00:00:00.000000000 Z
+date: 2013-10-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -2400,6 +2400,8 @@ files:
 - db/migrate/20131013144010_add_type_to_membership_type.rb
 - db/migrate/20131013150230_add_duration_to_membership_type.rb
 - db/migrate/20131013192807_change_number_of_shows_to_tickets.rb
+- db/migrate/20131023200559_add_admin_to_user_memberships.rb
+- db/migrate/20131029173612_add_sales_start_to_membership_typ.rb
 - lib/artfully_ose/common_abilities.rb
 - lib/artfully_ose/core_ext.rb
 - lib/artfully_ose/engine.rb