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

data/app/assets/javascripts/application.js

@@ -2,14 +2,15 @@
 //= require jquery_ujs
 //= require jquery-lib
 //= require jquery-migrate-1.2.1
-//= require angular.min
-//= require angular-resource.min
+//= require angular
+//= require angular-resource
 //= require locationselector
 //= require_directory ./custom
 //= require bootstrap
 //= require wysihtml5-0.3.0.min.js
 //= require bootstrap-wysihtml5.js
 //= require_self
+//= require change-membership
 
 var artfully = angular.module("artfully", ['ngResource']);
 
@@ -205,6 +206,16 @@ $(document).ready(function() {
   $('.no-fa').on('keyup', checkForFA);
   $('.no-fa').on('change', clearFA);
 
+  $('#membership_type_offer_renewal').click(function () {
+    $("#renewal-price-group").toggle();
+  });
+
+  if($("#membership_type_offer_renewal").is(':checked')) {
+    $("#renewal-price-group").show();
+  } else {
+    $("#renewal-price-group").hide();
+  }
+
   bindMemberTickets()
 
 	/*********** EXISTING ARTFUL.LY JS ******/

data/app/assets/javascripts/change-membership.js

@@ -0,0 +1,98 @@
+//
+// Service for keeping track of which memberships are selected
+//
+angular.module('artfully').factory('membershipSelections', function() {
+  // Map of selected membership ids
+  var map = {};
+
+  // Initial values
+  $('input[name=membership_ids\\[\\]]:checked').each(function(i,input) { map[input.value] = true });
+
+  // Watch for changes
+  $('body').on('change', 'input[name=membership_ids\\[\\]]', function(change) {
+    var e     = $(change.target);
+    var row   = e.closest('tr');
+    var type  = $(row.find('.item-description')[0]);
+    var price = $(row.find('.price')[0]);
+    var membership_id = e.val();
+
+    if ($(e).prop( "checked" )) {
+      // Add the membership id if it's not already in the list
+      if (map[membership_id] === undefined) {
+        map[membership_id] = {
+          id: membership_id,
+          type: type.text(),
+          price: price.text()
+        };
+      }
+
+    } else {
+      // Remove the membership id
+      delete map[membership_id];
+    }
+  });
+
+  return map;
+});
+
+//
+// Controller
+//
+angular.module('artfully').controller('ChangeMembershipController', ['$scope', 'membershipSelections', function($scope, membershipSelections) {
+
+  // Template variables
+  $scope.payment_method = 'cash';
+  $scope.price          = 0;
+  $scope.total          = 0;
+  $scope.selected       = {};
+
+  // Helpers
+  $scope.anySelected = function() {
+    if (Object.keys(membershipSelections).length == 0 ) {
+      return false;
+    }
+    return true;
+  }
+
+  $scope.changeSelected = function(click) {
+    click.preventDefault();
+
+    if (!$scope.anySelected()) {
+      alert("Select one or more memberships to change.");
+      return false;
+    }
+
+    // Open the modal
+    $('#change').modal('show');
+    return false;
+  }
+
+  $scope.updateTotal = function() {
+    var price = parseFloat($scope.price.substr(1).replace(/,/, ""));
+    var total = (Object.keys($scope.selected).length * price);
+
+
+    $scope.total = '$'+total.toFixed(2);
+  }
+
+  // Update the list of selected ids when the modal is shown
+  $("#change").on('shown', function(shown) {
+    $scope.selected = membershipSelections;
+
+    // Mask the price field
+    touchCurrency();
+  });
+
+  // Clear the list of selected ids when the modal is hidden
+  $("#change").on('hidden', function(hidden) {
+    $scope.payment_method = 'cash';
+    $scope.price = 0;
+    $scope.total = 0;
+    $scope.selected = {};
+
+    // Reset the form
+    var form = $(this).find('form')[0];
+    if (form) { form.reset(); }
+  });
+}]);
+

data/app/assets/stylesheets/application.sass

@@ -673,3 +673,6 @@ p.alternate_form_link
 #edit-membership-kit
   label
     font-weight: bold
+
+.bordered-section
+  border-bottom: 1px solid #ACACAE

data/app/controllers/artfully_ose_controller.rb

@@ -17,6 +17,18 @@ class ArtfullyOseController < ActionController::Base
 
   protected
 
+    #
+    # don't appent "kit" to the name.
+    # Example requires_kit :membership
+    #
+    def self.requires_kit(kit)
+      before_filter do 
+        unless current_user.current_organization.has_kit? (kit)
+          raise CanCan::AccessDenied
+        end
+      end
+    end
+
     def to_plural(variable, word)
       self.class.helpers.pluralize(variable, word)
     end

data/app/controllers/membership_awards_controller.rb

@@ -1,4 +1,6 @@
 class MembershipAwardsController < ArtfullyOseController
+  requires_kit :membership
+  
   def new
     Rails.cache.delete(cache_key)
 

data/app/controllers/membership_changes_controller.rb

@@ -0,0 +1,39 @@
+class MembershipChangesController < ApplicationController
+  before_filter :set_person, :only => [:create]
+
+  def create
+    change = MembershipChange.new(membership_change_params)
+    if change.save
+      # Success!
+      flash[:success] = 'Memberships have been successfully changed.'
+    else
+      # Error!
+      flash[:error] = error_message
+    end
+  rescue Exception => e
+    Rails.logger.info(e.message)
+    Rails.logger.info(e.backtrace.join("\n"))
+
+    flash[:error] = error_message
+  ensure
+    redirect_to person_memberships_path(@person)
+  end
+
+  private
+  def error_message
+    "We're sorry but we could not process the change.  Please make sure all fields are filled out accurately."
+  end
+
+  def membership_change_params
+    permitted = [:membership_ids, :membership_type_id, :price, :payment_method, :credit_card_info, :person_id]
+    permitted.reduce({}) do |all,key|
+      all[key] = params[key] if params[key].present?
+      all
+    end
+  end
+
+  def set_person
+    @person = Person.find(params[:person_id])
+    true
+  end
+end

data/app/controllers/membership_types_controller.rb

@@ -1,4 +1,6 @@
 class MembershipTypesController < ArtfullyOseController
+  requires_kit :membership
+
   def index
     @membership_types = current_organization.membership_types.paginate(:page => params[:page], :per_page => 50)
 

data/app/controllers/sales_controller.rb

@@ -63,7 +63,7 @@ class SalesController < ArtfullyOseController
     def tickets_remaining
       remaining = {}
       @sale.ticket_types.each do |ticket_type|
-        remaining[ticket_type.id] = ticket_type.available
+        remaining[ticket_type.id] = ticket_type.available("box_office")
       end
       remaining
     end

data/app/controllers/store/checkouts_controller.rb

@@ -29,10 +29,10 @@ class Store::CheckoutsController < Store::StoreController
     redirect_to store_order_path
   end
 
-  # def dook
-  #   @order = Order.find(157)
-  #   render :thanks
-  # end
+  def dook
+    @order = Order.find(157)
+    render :thanks
+  end
 
   def filter(params)
     filters = Rails.application.config.filter_parameters

data/app/controllers/store/orders_controller.rb

@@ -6,7 +6,7 @@ class Store::OrdersController < Store::StoreController
     handler = OrderHandler.new(current_cart, current_member)
     handler.handle_tickets(params)    
     handler.handle_donation(params, @store_organization)
-    handler.handle_memberships(params)
+    handler.handle_memberships(params, current_member)
     handler.handle_discount(params)
 
     flash[:alert] = handler.error unless handler.error.blank?

data/app/helpers/artfully_ose_helper.rb

@@ -13,6 +13,16 @@ module ArtfullyOseHelper
     end
   end
 
+  #
+  # Pass kit name with Kit or _kit. Like this "with_kit(:membership)"
+  #
+  def with_kit(kit)
+    organization = current_user.try(:current_organization) || @store_organization
+    if organization.has_kit? kit
+      yield
+    end
+  end
+
   def thanks_message(person)
     message = "Thanks"
     message += ", #{person.first_name}" unless person.first_name.blank?

data/app/helpers/membership_types_helper.rb

@@ -2,4 +2,21 @@ 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
+
+  def options_for_membership_types(types, opts={})
+    default_options = {
+      :include_price => false
+    }
+    options = default_options
+    options = options.merge(opts) unless opts.blank?
+
+    items = types.map do |type|
+      name = type.name
+      name << (' - $%.2f' % number_to_dollars(type.price)) if options[:include_price]
+
+      [name, type.id]
+    end
+
+    options_for_select items
+  end
 end

data/app/models/actions/change_action.rb

@@ -0,0 +1,13 @@
+class ChangeAction < GetAction
+  def subtype
+    "Change"
+  end
+
+  def action_type
+    "Get"
+  end
+
+  def verb
+    "changed"
+  end
+end

data/app/models/carts/cart.rb

@@ -2,8 +2,8 @@ class Cart < ActiveRecord::Base
   include ActiveRecord::Transitions
   
   has_many :donations, :dependent => :destroy
-  has_many :tickets
-  has_many :memberships
+  has_many :tickets,     :after_add => :calculate_fees
+  has_many :memberships, :after_add => :calculate_fees
   after_destroy :clear!
   before_validation :set_token
   attr_accessor :special_instructions
@@ -74,6 +74,10 @@ class Cart < ActiveRecord::Base
     items.sum(&:service_fee)
   end
 
+  def calculate_fees(obj)
+    FeeCalculator.apply(FeeStrategy.new).to(self)
+  end
+
   def <<(tkts)
     tkts = Array.wrap(tkts)
     tkts.each do |t|
@@ -81,7 +85,6 @@ class Cart < ActiveRecord::Base
       t.cart_price  = t.ticket_type.price
     end
     self.tickets << tkts.flatten
-    FeeCalculator.apply(FeeStrategy.new).to(self)
   end
 
   def subtotal

data/app/models/donation.rb

@@ -15,6 +15,10 @@ class Donation < ActiveRecord::Base
     0
   end
 
+  def realized_fee
+    self.class.realized_fee
+  end
+
   def order_summary_description
     "Donation"
   end

data/app/models/ext/integrations.rb

@@ -24,15 +24,13 @@ module Ext
       #
       # Used for rendering widget and api charts. Storefront uses section.ticket_types_for instead
       #
-      def chart_for(channel, member, organization_id = nil)
+      def chart_for(channel, organization_id = nil)
         chart = Chart.joins(:show)
                      .joins(:sections => :ticket_types)
                      .includes(:sections => :ticket_types)
                      .where('shows.id = ?', self.id)
                      .where("ticket_types.#{channel} = ?", true)
 
-        chart = chart.where(:ticket_types=>{:membership_type_id=>member.try(:current_membership_types)})
-
         chart.first
       end
     end

data/app/models/item.rb

@@ -263,7 +263,7 @@ class Item < ActiveRecord::Base
     def set_prices_from(prod)
       self.original_price = prod.price
       self.price          = (prod.sold_price || prod.cart_price || prod.price)
-      self.realized_price = self.price - prod.class.realized_fee
+      self.realized_price = self.price - prod.realized_fee
       self.net            = (self.realized_price - (per_item_processing_charge || lambda { |item| 0 }).call(self)).floor
       self.service_fee    = prod.service_fee || 0
     end

data/app/models/kits/membership_kit.rb

@@ -17,7 +17,7 @@ class MembershipKit < Kit
 
   before_save :sanitize_accessors
 
-  ACCESSORS = [ :marketing_copy_heading, :marketing_copy_sidebar, :thanks_copy, :invitation_email_text_copy ]
+  ACCESSORS = [ :marketing_copy_heading, :marketing_copy_sidebar ]
   
   ACCESSORS.each do |accessor|
     attr_accessible accessor

data/app/models/member.rb

@@ -79,6 +79,12 @@ class Member < ActiveRecord::Base
     [CURRENT, LAPSED, PAST, NONE]
   end
 
+  self.states.each do |st|
+    define_method "#{st}?" do
+      "#{st}".to_s == self.state.to_s
+    end
+  end
+
   def self.generate_password
     Devise.friendly_token
   end

data/app/models/membership.rb

@@ -19,11 +19,11 @@ class Membership < ActiveRecord::Base
   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)
+  def self.for(membership_type, member = nil)
     new.tap do |membership|
       membership.membership_type  = membership_type
       membership.organization     = membership_type.organization
-      membership.price            = membership_type.price
+      membership.price            = membership_type.price_for(member)
       membership.starts_at        = membership_type.starts_at
       membership.ends_at          = membership_type.ends_at
     end
@@ -62,6 +62,14 @@ class Membership < ActiveRecord::Base
     0
   end
 
+  def realized_fee
+    self.membership_type.hide_fee? ? self.price * MembershipType::SERVICE_FEE : 0
+  end
+
+  def expired?
+    ends_at < Time.now
+  end
+
   def refundable?
     false
   end

data/app/models/membership_change.rb

@@ -0,0 +1,176 @@
+class MembershipChange
+  include ActiveModel::Validations
+
+  attr_reader :cart
+  attr_reader :checkout
+  attr_reader :changing_memberships
+  attr_reader :new_memberships
+  attr_reader :payment
+
+  attr_accessor :credit_card_info
+  attr_accessor :membership_ids
+  attr_accessor :membership_type_id
+  attr_accessor :payment_method
+  attr_accessor :person_id
+  attr_accessor :price
+
+  validates :person_id, :presence => true
+  validates :membership_ids, :presence => true
+  validates :membership_type_id, :presence => true
+  validates :payment_method, :presence => true
+  validates :price, :presence => true
+  validates :credit_card_info, :presence => {:if => :credit?}
+
+  # This is purely to assuage shoulda and it's validation matchers
+  def self.reflect_on_association(a)
+    return false
+  end
+
+  def initialize(params = nil)
+    @price = 0
+    assign_params(params) if params
+  end
+
+  def assign_params(new_params)
+    return if new_params.blank?
+
+    params = new_params.stringify_keys
+    params.each do |k,v|
+      if respond_to?("#{k}=")
+        send("#{k}=", v)
+      else
+        raise(ArgumentError, "unknown parameter: #{k}")
+      end
+    end
+  end
+
+  def cart
+    unless @cart
+      @cart = Cart.create
+
+      # Add the new memberships
+      new_memberships.each do |membership|
+        cart.memberships << membership
+      end
+    end
+    @cart
+  end
+
+  def changing_memberships
+    @changing_memberships ||= Membership.where(id: membership_ids)
+  end
+
+  def checkout
+    @checkout ||= MembershipChange::Checkout.new(cart, payment)
+  end
+
+  def comp?
+    'comp' == payment_method
+  end
+
+  def credit?
+    !!(payment_method =~ /credit|cc/)
+  end
+
+  def membership_type
+    @membership_type ||= MembershipType.find(membership_type_id)
+  end
+
+  def new_memberships
+    if @new_memberships.blank?
+      @new_memberships = []
+
+      unless membership_ids.blank?
+        # Grab the old memberships and hash on id
+        old_memberships  = changing_memberships.reduce({}) do |all, o|
+          all[o.id.to_s] = o
+          all
+        end
+
+        # Make new memberships
+        @new_memberships = membership_ids.map do |old_membership_id|
+          old = old_memberships[old_membership_id]
+
+          # Create the new membership, setting sold price, and the start/end dates from the old one
+          membership           = Membership.for(membership_type)
+          membership.starts_at = old.starts_at
+          membership.ends_at   = old.ends_at
+          membership.price     = price
+          membership.member    = person.member
+
+          membership
+        end
+      end
+    end
+    @new_memberships
+  end
+
+  def payment
+    unless @payment
+      @payment = Payment.create(payment_method, {credit_card: credit_card_info})
+      @payment.customer = person
+    end
+    @payment
+  end
+
+  def person
+    @person ||= Person.find(person_id)
+  end
+
+  def price
+    return nil unless @price
+    return 0 if comp?
+    @price
+  end
+
+  def price=(new_price)
+    new_price = new_price.to_i unless new_price.blank?
+    @price    = new_price
+  end
+
+  def save
+    return false unless valid?
+
+    Order.transaction do
+      expiration = 1.second.ago
+
+      # Complete checkout
+      success = checkout.finish
+
+      # Failure?
+      raise MembershipChange::Error unless success
+
+      # Expire old memberships
+      changing_memberships.each do |old|
+        old.adjust_expiration_to(expiration)
+      end
+    end
+    true
+  rescue MembershipChange::Error => e
+    payment.errors[:base].each do |msg|
+      errors.add(:base, msg)
+    end
+    false
+  end
+
+  def valid?
+    super && checkout.valid?
+  end
+
+  class Error < StandardError; end
+
+  class Cart < ::Cart
+  end
+
+  class Checkout < ::Checkout
+    def order_class
+      MembershipChange::Order
+    end
+  end
+
+  class Order < ::Order
+    def membership_action_class
+      ChangeAction
+    end
+  end
+end