artfully_ose 1.2.0.pre.16 → 1.2.0.pre.17

data/app/models/membership_type.rb

@@ -1,7 +1,8 @@
 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, :sales_start_at, :sales_end_at
+                  :starts_at, :duration, :type, :period, :number_of_tickets, :sales_start_at, :sales_end_at,
+                  :thanks_copy, :invitation_email_text_copy, :hide_fee, :renewal_price, :offer_renewal
 
   belongs_to :organization
   has_many :memberships
@@ -16,6 +17,8 @@ class MembershipType < ActiveRecord::Base
   scope :on_sale, where(:on_sale => true)
   scope :not_ended, where('ends_at > ?', DateTime.now)
 
+  SERVICE_FEE = 0.05
+
   comma do
     name
     description
@@ -44,6 +47,12 @@ class MembershipType < ActiveRecord::Base
     self.name.end_with?("Membership") ? self.name : self.name + " Membership"
   end
 
+  def price_for(member = nil)
+    return price if member.nil?
+
+    (offer_renewal? && member.current?) ? renewal_price : price
+  end
+
   def create_list_segment
     @search = organization.searches.create({:membership_type => self})
     @segment = organization.segments.create({:search => @search, :name => self.name})

data/app/models/order_handler.rb

@@ -76,7 +76,7 @@ class OrderHandler
   end
 
 
-  def handle_memberships(params)
+  def handle_memberships(params, member = nil)
     unless params[:membership_type].blank?
       membership_type_id = params[:membership_type][:id]
       quantity = params[:quantity].to_i
@@ -85,7 +85,7 @@ class OrderHandler
       #current_membership_type_count = self.cart.memberships.count{ |membership| membership.membership_type_id == membership_type_id }
 
       (1..quantity).each do |i|
-        self.cart.memberships << Membership.for(MembershipType.find(membership_type_id))
+        self.cart.memberships << Membership.for(MembershipType.find(membership_type_id), member)
       end
       
     end

data/app/models/orders/order.rb

@@ -237,6 +237,10 @@ class Order < ActiveRecord::Base
   def memberships(reload=false)
     items(reload).select(&:membership?)
   end
+
+  def membership_types
+    memberships.collect{|item| item.product.membership_type}.uniq
+  end
   
   def has_single_donation?
     (donations.size == 1) && tickets.empty?
@@ -370,6 +374,10 @@ class Order < ActiveRecord::Base
     self.person.calculate_lifetime_donations
   end
 
+  def membership_action_class
+    GetAction
+  end
+
   def purchase_action_class
     GetAction
   end
@@ -422,7 +430,7 @@ class Order < ActiveRecord::Base
 
   def create_membership_action
     unless self.memberships.empty?
-      action                  = GetAction.new
+      action                  = self.membership_action_class.new
       action.person           = self.person
       action.subject          = self
       action.organization     = self.organization

data/app/models/section.rb

@@ -60,7 +60,7 @@ class Section < ActiveRecord::Base
     types << ticket_types.storefront
     unless member.nil?
 
-      #Add "unrestricted member" ticket_types that aren't tired to a particular membership type
+      #Add "unrestricted member" ticket_types that aren't tied to a particular membership type
       types << ticket_types.members.select{|ticket_type| !ticket_type.member_ticket?} unless member.nil?
 
       #Now add member ticket_types that apply to this particular member

data/app/models/show.rb

@@ -146,7 +146,7 @@ class Show < ActiveRecord::Base
       "show_time" => show_time,
       "datetime" => datetime_local_to_event,
       "destroyable" => destroyable?,
-      "chart" => chart_for("storefront", options[:member], options[:organization_id]).as_json(options)
+      "chart" => chart_for("storefront", options[:organization_id]).as_json(options)
     }
   end
 
@@ -156,7 +156,7 @@ class Show < ActiveRecord::Base
   def as_widget_json(options = {})
     as_json.merge(:event => event.as_json, 
                   :venue => event.venue.as_json, 
-                  :chart => chart_for("storefront", options[:member], options[:organization_id]).as_json(options))
+                  :chart => chart_for("storefront", options[:organization_id]).as_json(options))
   end
 
   def bulk_on_sale(ids)

data/app/models/ticket.rb

@@ -150,6 +150,10 @@
     0
   end
 
+  def realized_fee
+    self.class.realized_fee
+  end
+
   def expired?
     datetime < DateTime.now
   end

data/app/models/ticket_type.rb

@@ -34,7 +34,7 @@ class TicketType < ActiveRecord::Base
   #
   # Returns an integer number of tickets available
   #
-  def available(member = nil)
+  def available(channel = "storefront", member = nil)
     available_in_section = Ticket.where(:section_id => self.section, :state => :on_sale, :cart_id => nil, :ticket_type_id => nil).count
 
     return available_in_section if unlimited? && !self.member_ticket?
@@ -42,7 +42,7 @@ class TicketType < ActiveRecord::Base
     available_measures = []
     available_measures << limit - committed.length - locked.length unless limit.nil?
     available_measures << available_in_section
-    available_measures << available_to(member, available_in_section) if self.member_ticket?
+    available_measures << available_to(member, available_in_section) if self.member_ticket? && channel == "storefront"
 
     [ available_measures.min, 0].max
   end

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

@@ -5,26 +5,27 @@
       .controls
         =f.text_field :name, :class => 'span4'
 
-    .control-group
-      =label_tag "Member ticket?", "Member ticket?", :class => 'control-label'
-      .controls
-        %label.radio.inline
-          = f.radio_button :member_ticket, true, :class => "member-ticket-yes"
-          Yes
-        %label.radio.inline
-          = f.radio_button :member_ticket, false, :class => "member-ticket-no"
-          No
-
-    .membership-fields{:style => "display: none"}
+    -with_kit :membership do
       .control-group
-        =f.label :membership_type_id, "Membership", :class => 'control-label'
+        =label_tag "Member ticket?", "Member ticket?", :class => 'control-label'
         .controls
-          =f.select :membership_type_id, options_from_collection_for_select(MembershipType.in_play, 'id', 'name', f.object.membership_type_id), {}, :class => 'span4'
+          %label.radio.inline
+            = f.radio_button :member_ticket, true, :class => "member-ticket-yes"
+            Yes
+          %label.radio.inline
+            = f.radio_button :member_ticket, false, :class => "member-ticket-no"
+            No
 
-      .control-group
-        =f.label :tickets_per_membership, "Tickets per Membership", :class => 'control-label'
-        .controls
-          =f.text_field :tickets_per_membership, :class => 'input-small'
+      .membership-fields{:style => "display: none"}
+        .control-group
+          =f.label :membership_type_id, "Membership", :class => 'control-label'
+          .controls
+            =f.select :membership_type_id, options_from_collection_for_select(MembershipType.in_play, 'id', 'name', f.object.membership_type_id), {}, :class => 'span4'
+
+        .control-group
+          =f.label :tickets_per_membership, "Tickets per Membership", :class => 'control-label'
+          .controls
+            =f.text_field :tickets_per_membership, :class => 'input-small'
 
     .control-group
       =f.label :price, "Price", :class => 'control-label'

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

@@ -0,0 +1,8 @@
+.row.bottom-room
+  .span3
+    %h3{:style => "margin-top: 0px"} Kits
+  .span9
+    %ul
+      %li Paid Ticketing
+      %li People
+      %li= link_to "Membership", [:edit, @organization.membership_kit], :id => "configure_#{@organization.membership_kit.type.underscore}"

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

@@ -9,10 +9,10 @@
       .navbar-inner
         .container   
           = link_to @store_organization.name, root_path, :class => 'brand'
-          %ul.nav
+          %ul.nav#main-menu-options
             %li= link_to "Buy Tickets", store_events_path(@store_organization.cached_slug)
-            %li= link_to "Become a Member", store_memberships_path(@store_organization.cached_slug)
-            -# %li= link_to "Passes"
+            -with_kit(:membership)do 
+              %li= link_to "Become a Member", store_memberships_path(@store_organization.cached_slug)
             %li= link_to "Donate Now", store_donate_path(@store_organization.cached_slug), :class => "btn btn-small btn-warning primary"
           %ul.nav.pull-right
             -if member_signed_in?

data/app/views/members/mailer/invitation_instructions.html.haml

@@ -1,7 +1,8 @@
 ="Hello #{@resource.person.first_name},"
 
-%p
-  =@resource.organization.membership_kit.invitation_email_text_copy.html_safe
+-@resource.current_membership_types.uniq.each do |membership_type|
+  %p
+    =membership_type.invitation_email_text_copy
 
 = link_to 'Setup your account now', accept_invitation_url(@resource, :invitation_token => @resource.invitation_token)
 

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

@@ -25,25 +25,9 @@
 
     .row-fluid.bottom-room
       .span3
-        %strong= f.label :thanks_copy, "Thanks Copy", :class => 'control-label'
-        .guide
-          Ut porta risus et lectus lobortis, vitae ultricies massa placerat. In non dapibus augue. 
-        %p
-          =link_to "Preview", "#thanks-preview-modal", 'data-toggle' => 'modal'
+        &nbsp
       .span9
-        = f.text_area :thanks_copy, :class => "input-xxlarge", :rows => "8"
-
-    .row-fluid.bottom-room
-      .span3
-        %strong= f.label :invitation_email_text_copy, "Welcome Email Copy", :class => 'control-label'
-        .guide
-          Ut porta risus et lectus lobortis, vitae ultricies massa placerat. In non dapibus augue. 
-        %p
-          =link_to "Preview", "#invite-preview-modal", 'data-toggle' => 'modal'
-      .span9
-        = f.text_area :invitation_email_text_copy, :class => "input-xxlarge", :rows => "8"
-
-    =f.submit "Save", :class => "btn btn-primary"
+        =f.submit "Save", :class => "btn btn-primary"
 
 #thanks-preview-modal.modal
   .modal-header

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

@@ -1,6 +1,7 @@
 =form_for @membership_type, :as => :membership_type, :html => { :class => 'form-horizontal' } do |f|
   =f.hidden_field :type, :value => @membership_type.type
   %fieldset
+    %legend Basics
     .control-group
       = f.label :name, "Name", :class => 'control-label'
       .controls
@@ -9,22 +10,87 @@
       = f.label :description, "Description", :class => 'control-label'
       .controls
         = f.text_area :description, :rows => "5"
+    .control-group
+      = f.label :number_of_tickets, "Number of Tickets", :class => 'control-label'
+      .controls
+        = f.text_field :number_of_tickets, :class => "span1"
+
+    =render "membership_types/#{@membership_type.class.name.underscore}_form", :f => f
+  %fieldset
+    %legend Pricing
     .control-group
       = f.label :price, "Price", :class => 'control-label'
       .controls
         = f.text_field :price, :class => 'input-small section-price currency'
+
     .control-group
-      = f.label :fee, "Member Fee", :class => 'control-label'
+      =f.label :hide_fee, "Hide service fee?", :class => 'control-label'
       .controls
-        = f.text_field :fee, :class => 'input-small section-price currency'
+        = f.select :hide_fee, options_for_select([["Yes", true], ["No", false]]), {}, :class => 'span1'
+        %br
+        =link_to "Learn more", "#pricing-example", "data-toggle" => "modal"
+
     .control-group
-      = f.label :number_of_tickets, "Number of Tickets", :class => 'control-label'
+      = f.label :offer_renewal, "Offer renewal price?", :class => 'control-label'
       .controls
-        = f.text_field :number_of_tickets, :class => "span1"
+        %label
+          = f.check_box :offer_renewal
 
+    .control-group#renewal-price-group
+      = f.label :renewal_price, "Renewal Price", :class => 'control-label'
+      .controls
+        = f.text_field :renewal_price, :class => 'input-small section-price currency'
 
-    =render "membership_types/#{@membership_type.class.name.underscore}_form", :f => f
+    #pricing-example.modal
+      .modal-header
+        .close{'data-dismiss'=>'modal'} x
+        %h3 Pricing Example
+      .modal-body
+        %table.table.table-compact
+          %tr
+            %th
+            %th.right Hidden fee
+            %th.right Shown fee
+          %tr
+            %td Membership price
+            %td.right $100
+            %td.right $100
+          %tr
+            %td Patron pays
+            %td.right $100
+            %td.right $100 + 5% service = $105
+          %tr
+            %td You receive
+            %td.right 
+              $100
+              %br
+                ="- 5% service" 
+              %br
+                ="- 3.5% processing" 
+              %br
+                ="$91.68"
+            %td.right $100 - 3.5% processing = $96.5
+      .modal-footer
+        = button_tag "Close", :class => "btn", 'data-dismiss' => 'modal'
 
+
+    / .control-group
+    /   = f.label :fee, "Member Fee", :class => 'control-label'
+    /   .controls
+    /     = f.text_field :fee, :class => 'input-small section-price currency'
+  %fieldset
+    %legend Storefront Copy
+    .control-group
+      = f.label :thanks_copy, "Thanks Message", :class => 'control-label'
+      .controls
+        = f.text_area :thanks_copy, :rows => "5"
+    .control-group
+      = f.label :invitation_email_text_copy, "Email Message", :class => 'control-label'
+      .controls
+        = f.text_area :invitation_email_text_copy, :rows => "5"
+
+  %fieldset
+    %legend Sales
     .control-group
       = f.label :fee, "Sales Start", :class => 'control-label'
       .controls

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

@@ -19,7 +19,7 @@
               %li
                 = link_to "Change Expiration", "#extend", 'data-toggle' => 'modal'
               %li
-                = link_to "Change Membership", "#change", 'data-toggle' => 'modal'
+                = link_to "Change Membership", "#change", 'ng-controller' => 'ChangeMembershipController', 'ng-click' => 'changeSelected($event)'
               %li
                 = link_to "Cancel Membership", "#cancel", 'data-toggle' => 'modal'
       .span6.right
@@ -41,10 +41,10 @@
           %tbody
             - @person.memberships.each do |membership|
               %tr
-                %td.grouped-checkbox= check_box_tag "membership_ids[]", membership.id, false
+                %td.grouped-checkbox= check_box_tag "membership_ids[]", membership.id, false, :id => "membership_id_#{membership.id}"
                 %td.item-description=link_to membership.membership_type.name, membership_type_path(membership.membership_type.id)
-                %td=l membership.starts_at, :format => :slashed_date
-                %td=l membership.ends_at, :format => :slashed_date
+                %td.starts-at=l membership.starts_at, :format => :slashed_date
+                %td.ends-at=l membership.ends_at, :format => :slashed_date
                 %td.price.right=number_as_cents membership.sold_price
                 %td.fee.right TODO
 
@@ -72,51 +72,63 @@
         =link_to "Process Refund", "#", :class => "btn btn-success", 'data-dismiss'=>'modal'
         =link_to "Cancel", "#", :class => "btn btn-danger", 'data-dismiss'=>'modal' 
 
-    #change.modal
-      =form_tag "#", :class => "form-horizontal", :method => :post do
+    #change.modal{'ng-controller' => 'ChangeMembershipController'}
+      =form_tag person_membership_changes_path, :class => "form-horizontal", 'novalidate' => 'novalidate', 'name' => 'changeForm', :method => :post do
         .modal-header
           .close{'data-dismiss'=>'modal'} x
           %h3 Change Membership
         .modal-body
           .control-group
-            %label.control-label="Membership Type"
+            %label.control-label="Selected Memberships"
             .controls
-              = select_tag :membership_type, options_from_collection_for_select(@membership_types, 'id', 'name')
+              %ol
+                %li{'ng-repeat' => 'membership in selected'}
+                  = hidden_field_tag('membership_ids[]', '{{membership.id}}')
+                  = '{{membership.type}} - {{membership.price}}'
+          .control-group
+            %label.control-label="New Membership Type"
+            .controls
+              = select_tag :membership_type_id, options_for_membership_types(@membership_types, include_price: true)
+
+          .control-group
+            %label.control-label Price Per Membership
+            .controls
+              = text_field_tag :price, '0', :class => 'span1 currency', 'ng-model' => 'price', 'ng-change' => 'updateTotal()'
 
           .control-group
-            %label.control-label Price per membership
+            %label.control-label Total Price
             .controls
-              .input-prepend
-                %span.add-on $
-                = text_field_tag :sold_price, "", :class => 'span1'
+              = text_field_tag 'total', '', :class => 'span1', :disabled => 'disabled', 'ng-model' => 'total'
 
-          #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', :humanized_value => 'Comp')
-              Comp
-            %label.radio
-              = radio_button_tag(:payment_method, :credit_card_manual, false, :class => 'payment-method', :humanized_value => 'Credit card')
-              Credit
+          .control-group
+            %label.control-label Payment Method
+            #payment-controls.controls
+              %label.radio
+                = radio_button_tag(:payment_method, :cash, true, :class => 'payment-method', :humanized_value => 'Cash', 'ng-model' => 'payment_method')
+                Cash
+              %label.radio
+                = radio_button_tag(:payment_method, :comp, false, :class => 'payment-method', :humanized_value => 'Comp', 'ng-model' => 'payment_method')
+                Comp
+              %label.radio
+                = radio_button_tag(:payment_method, :credit_card_manual, false, :class => 'payment-method', :humanized_value => 'Credit card', 'ng-model' => 'payment_method')
+                Credit
 
-          #payment-info.hidden.well
+          #payment-info.well{'ng-show' => "'credit_card_manual' == payment_method"}
             .control-group
-              %label.control-label="Name on Card"
-              .controls= text_field_tag("credit_card[name]", params[:cardholder_name])
+              %label.control-label='Name on Card'
+              .controls= text_field_tag('credit_card_info[name]')
             .control-group
-              %label.control-label="Card Number"
-              .controls= text_field_tag("credit_card[number]", params[:card_number])
+              %label.control-label='Card Number'
+              .controls= text_field_tag('credit_card_info[number]')
             .control-group
-              %label.control-label="Expiration Date"
+              %label.control-label='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')
+                = select_tag('credit_card_info[month]', options_for_select(1..12), :class => 'input-small inline')
+                = select_tag('credit_card_info[year]', options_for_select(Time.now.year..Time.now.year + 10), :class => 'input-small inline')
 
-      .modal-footer
-        =link_to "Process Membership Change", "#", :class => "btn btn-success", 'data-dismiss'=>'modal'
-        =link_to "Cancel", "#", :class => "btn btn-danger", 'data-dismiss'=>'modal'
+        .modal-footer
+          = submit_tag "Process Membership Change", :class => "btn btn-success"
+          =link_to "Cancel", "#", :class => "btn btn-danger", 'data-dismiss'=>'modal'
 
     #partial-refund.modal
       .modal-header
@@ -141,15 +153,3 @@
       .modal-footer
         =link_to "Cancel Memberhships", "#", :class => "btn btn-success", 'data-dismiss'=>'modal'
         =link_to "Cancel", "#", :class => "btn btn-danger", 'data-dismiss'=>'modal'
-
--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");
-      }
-    });