artfully_ose 1.2.0.pre.6 → 1.2.0.pre.7

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    ZWQ0MjYyODBmMjg3NzRjZTczNzY1N2U1MDM0NTNiNzU3N2ZlYTZhNw==
+    YzQxYTM0Zjg3MzYyNmExODYwMjczYjYwYzQzY2YzZTI1ZjgwNjcyNg==
   data.tar.gz: !binary |-
-    MjkwZmFiMmY3Njg0ZmQxMDU3YzBkZDYyMDEyOWJjYzhkNzFlOWJjMg==
+    NDU3MzllOGU0Mjc3ODFiMjlkNTI0OWYwZjg4ODc2YjBkZTEwMTZiOQ==
 !binary "U0hBNTEy":
   metadata.gz: !binary |-
-    OWMyYWMwZjU4MDc4N2Q5ZjJjM2M2NzU2OTYzZmZlODY2M2ZjY2FmMDcwMTRj
-    Y2Q5NTMyNGRjYjQxZmEyNWExOGE2NjlkMDZkNTYzMWZjYTUwMTFjNGEyY2Y0
-    OGVkZTkzYjBjNTIwMjA0ZjkxOWU5YzEzNDVmYTYxNGE4MTJlMjc=
+    OWFkMmYwNWQ1ZDExNjY5NzUwN2Q4ODg4MDUyM2QzNTM4ZTE0ZGEwM2Q4MDA4
+    NWEwYTE3MzFiMTA0ZTVjMGE1YWRlM2ExNjY3ZWI4OGUxZTU5ZmU0YWQwYmNl
+    YzViY2Y3N2MzODY3MjQzZWMzMDFhODc1MGQ0N2YxYjQxOWM0MGM=
   data.tar.gz: !binary |-
-    NDNiYmFmMWIwNmM5ZmZhODE3MzljNTZiMDllMWZlZTZiYWM2NmUxZDg1Zjc4
-    MjI5ODM0OGNkMDJhNWQ0YmNmOGQzOTU0M2U3NTkxODJlOTA3YjkzNGY1ZDI3
-    N2UwNDBlNjZiOTA1NmJlZWNmNDMyNjI0OTFjZDVkYThmYjUxN2E=
+    YzllOGQzNzMyMGMzM2NiMDJmYTUwOWM1YjM0MGI0OWYxNzRlMWE2YzZjZjI2
+    Nzc3ZTc0ODhiZThmNTIyODdjYzYzNjJmNmZjOWI0MTFjOWNhZWZlYzk2ZmI4
+    YzhhZTQ0YmY2OThhYjhiZWQzZDc5OGM2MTYwNGI3ZGQ4ZjU5OGE=

data/app/controllers/membership_types_controller.rb

@@ -4,7 +4,9 @@ class MembershipTypesController < ArtfullyOseController
   end
 
   def new
-    @membership_type = MembershipType.new
+    with_type_selected do
+      @membership_type = Kernel.const_get(params[:type].camelize).new
+    end
   end
 
   def create
@@ -17,4 +19,10 @@ class MembershipTypesController < ArtfullyOseController
   def edit
     @membership_type = MembershipType.find(params[:id])
   end
+
+  private
+    def with_type_selected
+      render :type and return if params[:type].blank?
+      yield
+    end
 end

data/app/mailers/reports_mailer.rb

@@ -3,9 +3,10 @@ class ReportsMailer < ActionMailer::Base
   layout "mail"
   add_template_helper(ArtfullyOseHelper)
 
-  def daily(tix, donations)
+  def daily(tix, donations, memberships)
     @tix = tix
     @donations = donations
+    @memberships = memberships
     mail to: @tix.organization.owner.email, bcc: "developers@fracturedatlas.org", subject: "Daily Report for #{@tix.start_date.strftime("%b %d, %Y")}"
   end
 end

data/app/models/daily_membership_report.rb

@@ -0,0 +1,44 @@
+class DailyMembershipReport
+  attr_accessor :rows, :start_date, :organization
+  extend ::ArtfullyOseHelper  
+
+  def initialize(organization, date=nil)
+    @organization = organization
+    @start_date = (date || 1.day.ago).in_time_zone(@organization.time_zone).midnight
+    @end_date = @start_date + 1.day
+    orders = organization.orders.includes(:person, :items => :product)
+    orders = orders.csv_not_imported.after(@start_date).before(@end_date) || []
+
+    @rows = []
+    orders.each do |order|
+      next if order.memberships.empty?
+      next if !order.revenue_applies_to_range(@start_date, @end_date)
+
+      unique_memberships = order.memberships.collect{|item| item.product.membership_type.name}.uniq
+      unique_memberships.each do |membership_type_name|
+        @rows << Row.new(order.items.select {|item| item.product.membership_type.name == membership_type_name})        
+      end
+    end
+  end
+
+  def total
+    @rows.collect(&:order).sum{|o| o.memberships.sum(&:total_price)}
+  end
+
+  class Row
+    attr_accessor :id, :details, :total, :person, :person_id, :order, :quantity, :membership
+    def initialize(items)
+      @order = items.first.order
+      @id = items.first.order.id
+      @membership = items.first.product.membership_type.name
+      @quantity = items.length
+      @total = DailyMembershipReport.number_to_currency(items.sum(&:price).to_f/100)
+      @person = items.first.order.person
+      @person_id = items.first.order.person.id
+    end
+
+    def calculate_total
+      DailyMembershipReport.number_to_currency(@order.memberships.sum(&:price).to_f/100)
+    end
+  end
+end

data/app/models/job/daily_email_report_job.rb

@@ -11,8 +11,10 @@ class DailyEmailReportJob
     Organization.where(:id => org_ids).receiving_sales_email.each do |org|
       tickets = DailyTicketReport.new(org, date)
       donations = DailyDonationReport.new(org, date)
-      next if tickets.rows.empty? && donations.rows.empty? && tickets.exchange_rows.empty?
-      ReportsMailer.daily(tickets, donations).deliver
+      memberships = DailyMembershipReport.new(org, date)
+
+      next if tickets.rows.empty? && donations.rows.empty? && tickets.exchange_rows.empty? && memberships.rows.empty?
+      ReportsMailer.daily(tickets, donations, memberships).deliver
     end
   end
 end

data/app/models/membership.rb

@@ -26,7 +26,7 @@ class Membership < ActiveRecord::Base
   end
 
   def update_member_counters
-    self.member.count_memberships
+    self.member.try(:count_memberships)
   end
 
   # TODO: DJ this. Could be thousands of people.

data/app/models/membership_type.rb

@@ -1,5 +1,5 @@
 class MembershipType < ActiveRecord::Base
-  attr_accessible :name, :price, :fee, :number_of_shows, :plan, :on_sale, :description, :ends_at, :starts_at
+  attr_accessible :name, :price, :fee, :number_of_shows, :plan, :on_sale, :description, :ends_at, :starts_at, :duration, :type, :period
 
   belongs_to :organization
   has_many :memberships

data/app/models/rolling_membership_type.rb

@@ -0,0 +1,9 @@
+class RollingMembershipType < MembershipType
+  def starts_at
+    DateTime.now
+  end
+
+  def ends_at
+    DateTime.now + (self.duration.send(self.period))
+  end
+end

data/app/models/search.rb

@@ -5,8 +5,9 @@ class Search < ActiveRecord::Base
   belongs_to :membership_type
   validates_presence_of :organization_id
 
-  attr_accessible :zip, :state, :event_id, :tagging,
-                  :person_type, :person_subtype,
+  attr_accessible :zip, :state, 
+                  :has_purchased_for, :event_id, 
+                  :tagging, :person_type, :person_subtype,
                   :min_lifetime_value, :max_lifetime_value,
                   :min_donations_amount, :max_donations_amount,
                   :min_donations_date, :max_donations_date, :discount_code,
@@ -34,8 +35,15 @@ class Search < ActiveRecord::Base
     conditions = []
 
     conditions << "Are tagged with #{tagging}." if tagging.present?
-    conditions << "Bought tickets for #{event.name}." if event_id.present?
-    conditions << "Purchased #{membership_type.name}" if membership_type_id.present?
+
+    if event_id.present?
+      if has_purchased_for
+        conditions << "Purchased tickets for #{event.name}." 
+      else
+        conditions << "Have not purchased tickets for #{event.name}." 
+      end
+    end
+
     if zip.present? || state.present?
       locations = []
       locations << state if state.present?
@@ -82,10 +90,7 @@ class Search < ActiveRecord::Base
       conditions << "Are #{state_str} members"
     end
 
-    if membership_type_id.present?
-      people = people.joins(:member => [:memberships => [:membership_type]])
-      people = people.where('membership_types.id = ?', membership_type_id)
-    end
+    conditions << "Are #{membership_type.name} members" if membership_type_id.present?
 
     String.new.tap do |s|
       if conditions.blank?
@@ -128,7 +133,20 @@ class Search < ActiveRecord::Base
 
     people = people.tagged_with(tagging) unless tagging.blank?
     people = people.joins(:address) unless zip.blank? && state.blank?
-    people = people.joins(:tickets => {:show => :event}).where("events.id" => event_id) unless event_id.blank?
+    
+    if event_id.present?
+      people = people.joins("LEFT JOIN `tickets` ON `tickets`.`buyer_id` = `people`.`id` ")
+                     .joins("LEFT JOIN `shows` ON `shows`.`id` = `tickets`.`show_id` ")
+                     .joins("LEFT JOIN `events` ON `events`.`id` = `shows`.`event_id`")
+
+      if has_purchased_for
+        people = people.where("events.id" => event_id)
+      else
+        people = people.where("`events`.`id` <> ? or events.id is null", event_id)
+      end
+    end
+    
+
     people = people.where("addresses.zip" => zip.to_s) unless zip.blank?
     people = people.where("addresses.state" => state) unless state.blank?
     people = people.where("people.lifetime_value >= ?", min_lifetime_value * 100.0) unless min_lifetime_value.blank?
@@ -155,10 +173,12 @@ class Search < ActiveRecord::Base
 
     ### MEMBERSHIP ##
 
-    if membership_status.present?
+    if searching_membership?
       #Necessary because we need a left join for the "Not" condition to work
       people = people.joins('left join members on members.person_id = people.id')
-      
+    end
+
+    if membership_status.present?
       people = people.merge(Member.current)  if membership_status == "Current"
       people = people.merge(Member.lapsed)   if membership_status == "Lapsed"
       people = people.merge(Member.past)     if membership_status == "Past"
@@ -166,10 +186,24 @@ class Search < ActiveRecord::Base
     end
 
     if membership_type_id.present?
-      people = people.joins(:member => [:memberships => [:membership_type]])
+
+      #
+      # this really stinks, but activereocrd.joins can't do a left join (needed for :person => :member)
+      # Good opportunity for a Rails pull request
+      #
+      people = people.joins('inner join memberships on members.id = memberships.member_id')
+      people = people.joins('inner join membership_types on membership_types.id = memberships.membership_type_id')
+
       people = people.where('membership_types.id = ?', membership_type_id)
     end
 
     people.select(column_names).uniq
   end
+
+
+
+  def searching_membership?
+    membership_status.present? ||
+    membership_type_id.present?
+  end
 end

data/app/models/seasonal_membership_type.rb

@@ -0,0 +1,2 @@
+class SeasonalMembershipType < MembershipType
+end

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

@@ -1,4 +1,5 @@
-=form_for @membership_type, :html => { :class => 'form-horizontal' } do |f|
+=form_for @membership_type, :as => :membership_type, :html => { :class => 'form-horizontal' } do |f|
+  =f.hidden_field :type, :value => params[:type]
   %fieldset
     .control-group
       = f.label :name, "Name", :class => 'control-label'
@@ -7,11 +8,7 @@
     .control-group
       = f.label :description, "Description", :class => 'control-label'
       .controls
-        = f.text_area :description
-    .control-group
-      = f.label :plan, "Plan", :class => 'control-label'
-      .controls
-        = f.select :plan, ["All In One", "Pay As You Go"]
+        = f.text_area :description, :rows => "5"
     .control-group
       = f.label :price, "Price", :class => 'control-label'
       .controls
@@ -21,17 +18,14 @@
       .controls
         = f.text_field :fee, :class => 'input-small section-price currency'
     .control-group
-      = f.label :number_of_shows, "Number of Shows", :class => 'control-label'
-      .controls
-        = f.text_field :number_of_shows
-    .control-group
-      = f.label :starts_at, "Mebership Begins", :class => 'control-label'
-      .controls
-        = f.text_field :starts_at, :class => :datepicker
-    .control-group
-      = f.label :ends_at, "Membership Ends", :class => 'control-label'
+      = f.label :number_of_tickets, "Number of Tickets", :class => 'control-label'
       .controls
-        = f.text_field :ends_at, :class => :datepicker
+        = f.text_field :number_of_tickets, :class => "span1"
+
+
+    =render "membership_types/#{@membership_type.class.name.underscore}_form", :f => f
+
+
     .control-group
       = f.label :on_sale, "On Sale", :class => 'control-label checkbox' 
       .controls 

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

@@ -0,0 +1,5 @@
+.control-group
+  = f.label :duration, "Duration", :class => 'control-label'
+  .controls
+    = f.text_field :duration, :class => "span1"
+    = f.select :period, ["Months", "Years"], {}, :class => "span2"

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

@@ -0,0 +1,8 @@
+.control-group
+  = f.label :starts_at, "Mebership Begins", :class => 'control-label'
+  .controls
+    = f.text_field :starts_at, :class => :datepicker
+.control-group
+  = f.label :ends_at, "Membership Ends", :class => 'control-label'
+  .controls
+    = f.text_field :ends_at, :class => :datepicker

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

@@ -8,20 +8,18 @@
 
 %table.table
   %tr
-    %th.right Name
-    %th.right Plan
+    %th Name
     %th.right Members
+    %th.right Tickets
     %th.right Price
     %th.right Fee
-    %th.right Shows
     %th.right On Sale
   -@membership_types.each do |membership_type|
     %tr
-      %td.right=link_to membership_type.name, edit_membership_type_path(membership_type)
-      %td.right=membership_type.plan
+      %td=link_to membership_type.name, edit_membership_type_path(membership_type)
       %td.right=link_to membership_type.members.count, segment_path(membership_type.segment)
+      %td.right=membership_type.number_of_tickets || "unlimited"
       %td.right=number_as_cents membership_type.price
       %td.right=number_as_cents membership_type.fee
-      %td.right=membership_type.number_of_shows
       %td.right
         =check_mark if membership_type.on_sale?

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

@@ -0,0 +1,16 @@
+.row
+  .span8.offset2
+    %h3 What type of membership is this?
+    .row-fluid
+      .span6
+        %h4 Season
+        %p
+          Do your members sign up for a theatrical season or other fixed-expiration?
+        .style-selection.center
+          =link_to "Setup Seasonal Membership", new_membership_type_path(:type => "SeasonalMembershipType"), :class => :btn
+      .span6
+        %h4 Rolling
+        %p
+          Do your members sign up for monthly or yearly memberships?
+        .style_selection.center
+          =link_to "Setup Rolling Membership", new_membership_type_path(:type => "RollingMembershipType"), :class => :btn

data/app/views/reports_mailer/daily.html.haml

@@ -4,6 +4,14 @@
   =l @tix.start_date, :format => :date
   = number_to_currency((@tix.total + @donations.total) / 100.0)
 
+:css
+  th.order     { width: 60px; }
+  th.customer  { width: 140px;}
+  th.total     { width: 80px; text-align: right }
+  td.total     { text-align: right }
+  td           { vertical-align: top}
+  table        { margin-bottom: 50px }
+
 %h1
   Daily Total: #{number_to_currency((@tix.total + @donations.total) / 100.0)}
 %h2
@@ -13,28 +21,30 @@
   %h3 Tickets: #{number_to_currency(@tix.total / 100.0)}
   %table.tabular-data{:cellspacing => "0"}
     %tr
-      %th Order
-      %th Total
-      %th Customer
-      %th.w200 Details
-      %th Special Instructions
+      %th.order Order
+      %th.customer Customer
+      %th Details
+      %th.total Total
     - @tix.rows.each do |row|
       %tr
         %td.order-number= link_to row.id, order_url(id: row.id)
-        %td.total= row.total
         %td= link_to row.person, person_url(id: row.person_id)
-        %td.w200= row.ticket_details
-        %td= row.special_instructions
+        %td
+          = row.ticket_details
+          %br 
+          %br
+          = row.special_instructions
+        %td.total= row.total
+
 - else
   %p There were no ticket orders placed.
 
-
 - if ! @tix.exchange_rows.empty?
   %h3 Exchanges
   %table.tabular-data{:cellspacing => "0"}
     %tr
-      %th Order
-      %th Customer
+      %th.order Order
+      %th.customer Customer
       %th Details
     - @tix.exchange_rows.each do |row|
       %tr
@@ -46,17 +56,39 @@
   %h3 Donations: #{number_to_currency(@donations.total / 100.0)}
   %table.tabular-data{:cellspacing => "0"}
     %tr
-      %th Order
-      %th Donation
-      %th Customer
+      %th.order Order
+      %th.customer Customer
+      %th Details
+      %t.total Total
     - @donations.rows.each do |row|
       %tr
         %td.order-number= link_to row.id, order_url(id: row.id)
-        %td.total= row.total
         %td= link_to row.person, person_url(id: row.person_id)
+        %td
+        %td.total= row.total
 - elsif @tix.organization.has_kit?(:regular_donation)
   %p There were no donations made.
 
+
+- if !@memberships.rows.empty?
+  %h3 Memberships: #{number_to_currency(@memberships.total / 100.0)}
+  %table.tabular-data{:cellspacing => "0"}
+    %tr
+      %th.order Order
+      %th.customer Customer
+      %th #
+      %th Membership
+      %th.total Total
+    - @memberships.rows.each do |row|
+      %tr
+        %td.order-number= link_to row.id, order_url(id: row.id)
+        %td= link_to row.person, person_url(id: row.person_id)
+        %td=row.quantity
+        %td=row.membership
+        %td.total= row.total
+- else
+  %p There were no memberhsips purchased.
+
 - content_for :footer do
   = render :partial => "fine_print"
   %p

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

@@ -29,7 +29,7 @@
           Events
       #collapseTwo.accordion-body.collapse
         .accordion-inner
-          -# = select_tag :has_has_not, options_for_select(["Purchaed Tickets", "Has Not Purchased"])
+          = f.select :has_purchased_for, options_for_select([["Purchaed tickets for", true], ["Have not purchased for", false]], selected: search.has_purchased_for)
           = f.select :event_id, options_for_select(@event_options, selected: search.event_id), include_blank: ""
 
     .accordion-group
@@ -99,7 +99,7 @@
           Type
       #collapseEight.accordion-body.collapse
         .accordion-inner
-          = f.select :membership_type_id, options_from_collection_for_select(@membership_types, 'id', 'name', @search.membership_type), include_blank: ""
+          = f.select :membership_type_id, options_from_collection_for_select(@membership_types, 'id', 'name', @search.membership_type_id), include_blank: ""
 
     / .accordion-group
     /   .accordion-heading

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

@@ -23,7 +23,7 @@
             %br
             %br
             .section
-              = form_for membership_type, :url => store_order_path(@store_organization.cached_slug), :method => :post do |f| 
+              = form_for membership_type, :as => :membership_type, :url => store_order_path(@store_organization.cached_slug), :method => :post do |f| 
                 = f.hidden_field :id
                 = select_tag :quantity, options_for_select((1..6).to_a.map {|i| [pluralize(i, "#{membership_type.name} Membership"), i]})
                 = f.submit 'Add to cart', :class => 'btn btn-primary', :style => 'margin-top: -10px'

data/config/routes.rb

@@ -15,6 +15,8 @@ Rails.application.routes.draw do
     namespace :store do
       resources :events, :only => [:show, :index]
       resources :memberships, :only => :index
+      resources :rolling_membership_types,  :controller => :membership_types
+      resources :seasonal_membership_types, :controller => :membership_types
       resources :shows, :only => :show
       resource  :checkout, :only => :create
 
@@ -221,6 +223,8 @@ Rails.application.routes.draw do
   resources :comps, :only => [ :new, :create ]
   resources :merges, :only => [ :new, :create ]
   resources :membership_types
+  resources :rolling_membership_types,  :controller => :membership_types
+  resources :seasonal_membership_types, :controller => :membership_types
   resources :membership_awards, :only => :create
 
   resources :imports do

data/db/migrate/20131011154027_add_purchased_to_searches.rb

@@ -0,0 +1,5 @@
+class AddPurchasedToSearches < ActiveRecord::Migration
+  def change
+    add_column :searches, :has_purchased_for, :boolean, :default => true
+  end
+end

data/db/migrate/20131013144010_add_type_to_membership_type.rb

@@ -0,0 +1,5 @@
+class AddTypeToMembershipType < ActiveRecord::Migration
+  def change
+    add_column :membership_types, :type, :string, :default => "SeasonalMembershipType"
+  end
+end

data/db/migrate/20131013150230_add_duration_to_membership_type.rb

@@ -0,0 +1,6 @@
+class AddDurationToMembershipType < ActiveRecord::Migration
+  def change
+    add_column :membership_types, :duration, :integer 
+    add_column :membership_types, :period, :string
+  end
+end

data/db/migrate/20131013192807_change_number_of_shows_to_tickets.rb

@@ -0,0 +1,5 @@
+class ChangeNumberOfShowsToTickets < ActiveRecord::Migration
+  def change
+    rename_column :membership_types, :number_of_shows, :number_of_tickets
+  end
+end

data/lib/artfully_ose/version.rb

@@ -1,3 +1,3 @@
 module ArtfullyOse
-  VERSION = "1.2.0.pre.6"
+  VERSION = "1.2.0.pre.7"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: artfully_ose
 version: !ruby/object:Gem::Version
-  version: 1.2.0.pre.6
+  version: 1.2.0.pre.7
 platform: ruby
 authors:
 - Artful.ly
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-10-10 00:00:00.000000000 Z
+date: 2013-10-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -1937,6 +1937,7 @@ files:
 - app/models/company.rb
 - app/models/contribution.rb
 - app/models/daily_donation_report.rb
+- app/models/daily_membership_report.rb
 - app/models/daily_ticket_report.rb
 - app/models/database_views/item_view.rb
 - app/models/database_views/order_view.rb
@@ -2016,9 +2017,11 @@ files:
 - app/models/phone.rb
 - app/models/refund.rb
 - app/models/return.rb
+- app/models/rolling_membership_type.rb
 - app/models/sale.rb
 - app/models/sale_search.rb
 - app/models/search.rb
+- app/models/seasonal_membership_type.rb
 - app/models/section.rb
 - app/models/section_summary.rb
 - app/models/segment.rb
@@ -2156,9 +2159,12 @@ files:
 - app/views/membership_awards/create.html.haml
 - app/views/membership_awards/new.html.haml
 - app/views/membership_types/_form.html.haml
+- app/views/membership_types/_rolling_membership_type_form.html.haml
+- app/views/membership_types/_seasonal_membership_type_form.html.haml
 - app/views/membership_types/edit.html.haml
 - app/views/membership_types/index.html.haml
 - app/views/membership_types/new.html.haml
+- app/views/membership_types/type.html.haml
 - app/views/memberships/index.html.haml
 - app/views/merges/_merge_preview_person.html.haml
 - app/views/merges/find_person.html.haml
@@ -2389,6 +2395,10 @@ files:
 - db/migrate/20131002191646_create_show_stats_view.rb
 - db/migrate/20131007141421_add_counters_to_member.rb
 - db/migrate/20131007144456_remove_expires_at_from_membership.rb
+- db/migrate/20131011154027_add_purchased_to_searches.rb
+- 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
 - lib/artfully_ose/common_abilities.rb
 - lib/artfully_ose/core_ext.rb
 - lib/artfully_ose/engine.rb