artfully_ose 1.2.0.pre.12 → 1.2.0.pre.15

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    MzI1NWEzY2JhNjA1YmIwZDkwMDUxYTQ0MWEwYzE2NThlYWNiYzRlNg==
+    ZGY4ZWY4MTE4YWM2NTg5NzRkNzllNTU3MjU4OGUzMGY2ODliOTJmZA==
   data.tar.gz: !binary |-
-    Njg3YTczYWY1OWE1YTZmOWY2NjIwMzc5NTM1NDY2MTA3NGU4ZjEzZg==
+    MWJkOTk4MmVmNDIxOTgzMGM4MjY0NDZkNDI1ODc4ZjhjZjVhZTA5NA==
 !binary "U0hBNTEy":
   metadata.gz: !binary |-
-    M2YwMGEyYzE2ZWZiNDljZTFiMjQ0ZjU0ZTNhMjY5NjgzNjE4MDkyNTBkZjJj
-    YjE3M2U3MWNlMDNhZjczNTVkN2Y4M2FhYTkwMjI0ZGI2YzAxOTJhNmVmMTlk
-    MzIyOTljMjZjZjNiNTIwNTUwNDA5MGUwN2Y0NTM1NDQyZGQ3Y2E=
+    NjQ4YTNiMDk1ZDBhNGNiNmM0Yjk1MzQzZDE4ZTA3NmM4MWQwZGU2ZTBiNzQx
+    MWZmMDA0MDVkYjJmYjdiYjg1OWZmNjAwM2JlMzI0NmVmZmU5MDg3NGRjOTZl
+    OGQzMmIzNTY5NDUxZDlkZGQ3ZmRjMTI5ZjdkNzE0NzRiZTdkM2I=
   data.tar.gz: !binary |-
-    OWNmOGU5OGQ1NTVhNTliZTU1NTY1ZDllOWY4NzJmYjUzMGZmOTkxOTEzNTcy
-    ZjQ4Mjc0MzU1NDY0ZjBhMjViNjE3Y2M2MWFmOGYxZjFkYmNlOGEzODg4ZTU3
-    MWFjYzk0N2RlM2NiMDc3MzAyYmJmMGFlZDIyZGM4MmI4ZmQ4YWM=
+    YjUxOTc2YTE5ODBjZDFlYTBjNmY3YWQwMzJhZGY0ZDMzZTM2OWMwYzgyMDc3
+    MjRlOTE3ZGUyZjMwMGU2ZjQ0NWRmNDRkOTU1MjYwYTA1ZTkwOGEwNTUyMjg4
+    ZmY5ZTcxOGU0Mzk4YzI5MWE0NTkyZjhiYzZjMmUwZTZhMmJkM2U=

data/app/controllers/membership_types_controller.rb

@@ -1,6 +1,16 @@
 class MembershipTypesController < ArtfullyOseController
   def index
     @membership_types = current_organization.membership_types.paginate(:page => params[:page], :per_page => 50)
+
+    respond_to do |format|
+      format.html
+
+      format.csv do
+        @filename = 'membership_types.csv'
+        @csv_string = @membership_types.to_comma
+        send_data @csv_string, :filename => @filename, :type => 'text/csv', :disposition => 'attachment'
+      end
+    end
   end
 
   def new

data/app/controllers/store/memberships_controller.rb

@@ -1,4 +1,9 @@
 class Store::MembershipsController < Store::StoreController
+  def show
+    @membership_types = [MembershipType.find(params[:id])]
+    render :index
+  end
+
   def index
     @membership_types = store_organization.membership_types.storefront
   end

data/app/helpers/membership_types_helper.rb

@@ -0,0 +1,5 @@
+module MembershipTypesHelper
+  def membership_type_storefront_path(membership_type)
+    url_for(organization_slug: membership_type.organization.cached_slug, controller: 'store/memberships', action: 'show', id: membership_type.id)
+  end
+end

data/app/models/daily_membership_report.rb

@@ -1,5 +1,5 @@
 class DailyMembershipReport
-  attr_accessor :rows, :start_date, :organization
+  attr_accessor :rows, :start_date, :organization, :lapsed_memberships
   extend ::ArtfullyOseHelper  
 
   def initialize(organization, date=nil)
@@ -19,6 +19,12 @@ class DailyMembershipReport
         @rows << Row.new(order.items.select {|item| item.product.membership_type.name == membership_type_name})        
       end
     end
+
+    @lapsed_memberships = organization.memberships.lapsed(@end_date, @start_date)
+  end
+
+  def send?
+    self.rows.any? || self.lapsed_memberships.any?
   end
 
   def total

data/app/models/job/daily_email_report_job.rb

@@ -3,18 +3,24 @@ class DailyEmailReportJob
 
     date ||= 1.day.ago
 
+    Organization.where(:id => organization_ids_to_email(date)).receiving_sales_email.each do |org|
+      tickets           = DailyTicketReport.new(org, date)
+      donations         = DailyDonationReport.new(org, date)
+      membership_report = DailyMembershipReport.new(org, date)
+
+      next if tickets.rows.empty? && donations.rows.empty? && tickets.exchange_rows.empty? && !membership_report.send?
+      ReportsMailer.daily(tickets, donations, membership_report).deliver
+    end
+  end
+
+  def organization_ids_to_email(date)
     #
     # We have to go back two days here intentionally to account for orgs across different time zones
     # We'll re-select the correct orders in the respective jobs
     #
     org_ids = Order.csv_not_imported.after(date-1.day).before(DateTime.now).pluck(:organization_id).uniq
-    Organization.where(:id => org_ids).receiving_sales_email.each do |org|
-      tickets = DailyTicketReport.new(org, date)
-      donations = DailyDonationReport.new(org, date)
-      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
+    orgs_with_lapsed_memberships = Membership.lapsed.pluck(:organization_id).uniq
+    org_ids = (org_ids + orgs_with_lapsed_memberships).uniq    
+    org_ids
   end
 end

data/app/models/membership.rb

@@ -11,8 +11,12 @@ class Membership < ActiveRecord::Base
   after_destroy   :update_member_counters
   after_update    :update_member_counters
 
+  #
+  # Make sure you're scoping when you use these. 
+  # organization.memberships.lapsed
+  #
   scope :current,      lambda { |time = Time.now| where("ends_at > ?", time) }
-  scope :lapsed,       lambda { |time = Time.now| where("ends_at < ?", time).where("ends_at > ?", time - 1.year) }
+  scope :lapsed,       lambda { |time = Time.now, since = (time - 1.year)| where("ends_at < ?", time).where("ends_at > ?", since.midnight) }
   scope :past,         lambda { |time = Time.now| where("ends_at < ?", time - 1.year) }
 
   def self.for(membership_type)
@@ -41,7 +45,6 @@ class Membership < ActiveRecord::Base
     end
   end
 
-
   def adjust_expiration_to(new_ends_at)
     self.ends_at = new_ends_at
     self.save

data/app/models/membership_type.rb

@@ -15,6 +15,24 @@ class MembershipType < ActiveRecord::Base
   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)
 
+  comma do
+    name
+    description
+    price
+    fee
+    number_of_tickets
+    type
+    members { |m| m.count }
+    duration
+    period
+    starts_at
+    ends_at
+    on_sale
+    sales_start_at
+    sales_end_at
+  end
+
+
   def membershipize
     self.name.end_with?("Membership") ? self.name : self.name + " Membership"
   end

data/app/models/organization.rb

@@ -20,6 +20,7 @@ class Organization < ActiveRecord::Base
   has_many :items
 
   has_many :membership_types
+  has_many :memberships
   has_many :members
   has_many :searches
 

data/app/models/rolling_membership_type.rb

@@ -4,6 +4,6 @@ class RollingMembershipType < MembershipType
   end
 
   def ends_at
-    DateTime.now + (self.duration.send(self.period))
+    DateTime.now + (self.duration.send(self.period.downcase))
   end
 end

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

@@ -35,8 +35,8 @@
         = f.text_field :sales_end_at, :value => "#{(l @membership_type.sales_end_at, :format => :date_for_input)  unless @membership_type.sales_end_at.nil?}", :class => :datepicker
 
     .control-group
-      = f.label :on_sale, "Show On Storefront", :class => 'control-label' 
-      .controls 
+      = f.label :on_sale, "Show On Storefront", :class => 'control-label'
+      .controls
         %label
           = f.check_box :on_sale
     .form-actions

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'
+  = f.label :starts_at, "Membership Begins", :class => 'control-label'
   .controls
     = f.text_field :starts_at, :value => "#{(l @membership_type.starts_at, :format => :date_for_input) unless @membership_type.starts_at.nil?}", :class => :datepicker
 .control-group
   = f.label :ends_at, "Membership Ends", :class => 'control-label'
   .controls
-    = f.text_field :ends_at, :value => "#{(l @membership_type.ends_at, :format => :date_for_input) unless @membership_type.ends_at.nil?}", :class => :datepicker
+    = f.text_field :ends_at, :value => "#{(l @membership_type.ends_at, :format => :date_for_input) unless @membership_type.ends_at.nil?}", :class => :datepicker

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

@@ -4,7 +4,7 @@
 .row.bottom-room
   .pull-right
     =icon_link_to("New Membership Type", new_membership_type_path, 'icon-plus', 'btn','')
-    =link_to "Download CSV", "", :class => "btn"
+    =link_to "Download CSV", membership_types_path(:format => "csv"), :class => "btn"
 
 %table.table
   %tr
@@ -14,6 +14,7 @@
     %th.right Price
     %th.right Fee
     %th.right On Storefront
+    %th.right
   -@membership_types.each do |membership_type|
     %tr
       %td=link_to membership_type.name, edit_membership_type_path(membership_type)
@@ -22,4 +23,6 @@
       %td.right=number_as_cents membership_type.price
       %td.right=number_as_cents membership_type.fee
       %td.right
-        =check_mark if membership_type.on_sale?
+        =check_mark if membership_type.on_sale?
+      %td.right
+        = link_to('Store link', membership_type_storefront_path(membership_type)) if membership_type.on_sale?

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

@@ -87,7 +87,18 @@
         %td=row.membership
         %td.total= row.total
 - else
-  %p There were no memberhsips purchased.
+  %p There were no memberships purchased.
+
+- if @memberships.lapsed_memberships.any?
+  %h3 Membership Lapses
+  %table.tabular-data{:cellspacing => "0"}
+    %tr
+      %th.customer Customer
+      %th Membership
+    - @memberships.lapsed_memberships.each do |membership_lapse|
+      %tr
+        %td.order-number= link_to membership_lapse.member.person, person_url(membership_lapse.member.person)
+        %td=membership_lapse.membership_type.name
 
 - content_for :footer do
   = render :partial => "fine_print"

data/config/routes.rb

@@ -14,7 +14,7 @@ Rails.application.routes.draw do
   scope ':organization_slug' do
     namespace :store do
       resources :events, :only => [:show, :index]
-      resources :memberships, :only => :index
+      resources :memberships, :only => [:show, :index]
       resources :rolling_membership_types,  :controller => :membership_types
       resources :seasonal_membership_types, :controller => :membership_types
       resources :shows, :only => :show

data/lib/artfully_ose/version.rb

@@ -1,3 +1,3 @@
 module ArtfullyOse
-  VERSION = "1.2.0.pre.12"
+  VERSION = "1.2.0.pre.15"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: artfully_ose
 version: !ruby/object:Gem::Version
-  version: 1.2.0.pre.12
+  version: 1.2.0.pre.15
 platform: ruby
 authors:
 - Artful.ly
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-10-29 00:00:00.000000000 Z
+date: 2013-11-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -1912,6 +1912,7 @@ files:
 - app/helpers/imports_helper.rb
 - app/helpers/link_helper.rb
 - app/helpers/members_helper.rb
+- app/helpers/membership_types_helper.rb
 - app/helpers/people_helper.rb
 - app/mailers/order_mailer.rb
 - app/mailers/producer_mailer.rb