artfully_ose 1.2.0.pre.19 → 1.2.0.pre.20

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: artfully_ose
 version: !ruby/object:Gem::Version
-  version: 1.2.0.pre.19
+  version: 1.2.0.pre.20
 platform: ruby
 authors:
 - Artful.ly
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-01-02 00:00:00.000000000 Z
+date: 2014-02-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -1873,8 +1873,12 @@ files:
 - app/assets/stylesheets/sass/themes/default.sass
 - app/assets/stylesheets/storefront.css
 - app/assets/stylesheets/wysiwyg-color.css
+- app/concerns/cart_finder.rb
+- app/concerns/immutable_action.rb
 - app/concerns/itemable.rb
 - app/concerns/oh_noes.rb
+- app/concerns/pdf_generation.rb
+- app/concerns/unrefundable.rb
 - app/controllers/actions_controller.rb
 - app/controllers/addresses_controller.rb
 - app/controllers/artfully_ose_controller.rb
@@ -1892,8 +1896,11 @@ files:
 - app/controllers/members/index_controller.rb
 - app/controllers/members/invitations_controller.rb
 - app/controllers/members/members_controller.rb
-- app/controllers/membership_awards_controller.rb
+- app/controllers/members/passwords_controller.rb
+- app/controllers/members/people_controller.rb
+- app/controllers/membership_cancellations_controller.rb
 - app/controllers/membership_changes_controller.rb
+- app/controllers/membership_comps_controller.rb
 - app/controllers/membership_kits_controller.rb
 - app/controllers/membership_types_controller.rb
 - app/controllers/memberships_controller.rb
@@ -1947,20 +1954,19 @@ files:
 - app/models/ability.rb
 - app/models/action.rb
 - app/models/actions/change_action.rb
+- app/models/actions/comp_action.rb
 - app/models/actions/do_action.rb
 - app/models/actions/exchange_action.rb
 - app/models/actions/get_action.rb
 - app/models/actions/give_action.rb
 - app/models/actions/go_action.rb
 - app/models/actions/hear_action.rb
-- app/models/actions/immutable_action.rb
 - app/models/actions/join_action.rb
 - app/models/actions/refund_action.rb
 - app/models/actions/say_action.rb
 - app/models/address.rb
 - app/models/box_office.rb
-- app/models/carts/cart.rb
-- app/models/carts/cart_finder.rb
+- app/models/cart.rb
 - app/models/chart.rb
 - app/models/checkout.rb
 - app/models/comp.rb
@@ -1970,7 +1976,6 @@ files:
 - 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
 - app/models/discount.rb
 - app/models/discounts/buy_one_get_one_free_discount_type.rb
 - app/models/discounts/discount_type.rb
@@ -1986,9 +1991,10 @@ files:
 - app/models/ext/delayed_indexing.rb
 - app/models/ext/devise_configuration.rb
 - app/models/ext/due.rb
-- app/models/ext/ext.rb
 - app/models/ext/integrations.rb
+- app/models/ext/preprocessor.rb
 - app/models/ext/resellable.rb
+- app/models/ext.rb
 - app/models/fee_calculator.rb
 - app/models/fee_strategy.rb
 - app/models/gateway_transaction.rb
@@ -2022,32 +2028,33 @@ files:
 - app/models/kits/membership_kit.rb
 - app/models/kits/regular_donation_kit.rb
 - app/models/kits/reseller_kit.rb
+- app/models/kits/scannable_tickets_kit.rb
 - app/models/kits/sponsored_donation_kit.rb
 - app/models/kits/ticketing_kit.rb
 - app/models/member.rb
 - app/models/member_number_generator.rb
 - app/models/membership.rb
-- app/models/membership_award.rb
+- app/models/membership_cancellation.rb
 - app/models/membership_change.rb
+- app/models/membership_comp.rb
+- app/models/membership_comp_job.rb
 - app/models/membership_type.rb
 - app/models/note.rb
+- app/models/order.rb
 - app/models/order_handler.rb
 - app/models/orders/application_order.rb
 - app/models/orders/comp_order.rb
 - app/models/orders/exchange_order.rb
 - app/models/orders/imported_order.rb
-- app/models/orders/order.rb
-- app/models/orders/pdf_generation.rb
 - app/models/orders/refund_order.rb
-- app/models/orders/unrefundable.rb
 - app/models/orders/web_order.rb
 - app/models/organization.rb
 - app/models/organization_ability.rb
 - app/models/parsed_row.rb
+- app/models/payment.rb
 - app/models/payments/cash_payment.rb
 - app/models/payments/comp_payment.rb
 - app/models/payments/credit_card_payment.rb
-- app/models/payments/payment.rb
 - app/models/person.rb
 - app/models/phone.rb
 - app/models/refund.rb
@@ -2193,20 +2200,35 @@ files:
 - app/views/layouts/members.html.haml
 - app/views/layouts/storefront.html.haml
 - app/views/members/index/index.html.haml
-- app/views/members/invitations/edit.html.erb
+- app/views/members/invitations/edit.html.haml
 - app/views/members/invitations/new.html.erb
+- app/views/members/mailer/_invitation_body.html.haml
 - app/views/members/mailer/invitation_instructions.html.haml
-- app/views/membership_awards/confirm.html.haml
-- app/views/membership_awards/create.html.haml
-- app/views/membership_awards/new.html.haml
+- app/views/members/mailer/reset_password_instructions.html.erb
+- app/views/members/passwords/edit.html.haml
+- app/views/members/sessions/new.html.haml
+- app/views/membership_cancellations/_form.html.haml
+- app/views/membership_cancellations/_modal.html.haml
+- app/views/membership_cancellations/_processing.html.haml
+- app/views/membership_cancellations/create.js.erb
+- app/views/membership_cancellations/new.js.erb
+- app/views/membership_comps/confirm.html.haml
+- app/views/membership_comps/create.html.haml
+- app/views/membership_comps/new.html.haml
 - app/views/membership_kits/edit.html.haml
+- app/views/membership_mailer/cancellation_confirmation.html.haml
+- app/views/membership_mailer/cancellation_confirmation.text.haml
+- app/views/membership_mailer/refund_problem.html.haml
+- app/views/membership_mailer/refund_problem.text.haml
 - app/views/membership_types/_form.html.haml
+- app/views/membership_types/_membership_type_fees.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/_membership_scripts.js.erb
 - app/views/memberships/index.html.haml
 - app/views/merges/_merge_preview_person.html.haml
 - app/views/merges/find_person.html.haml
@@ -2236,6 +2258,9 @@ files:
 - app/views/organizations/index.html.haml
 - app/views/organizations/new.html.haml
 - app/views/organizations/show.html.haml
+- app/views/pdfs/member.html.haml
+- app/views/pdfs/order.html.haml
+- app/views/people/_comp_membership.html.haml
 - app/views/people/_convert_to_company_modal.html.haml
 - app/views/people/_edit_modal.html.haml
 - app/views/people/_form.html.haml
@@ -2461,6 +2486,13 @@ files:
 - db/migrate/20131206175325_add_marketing_to_membership_type.rb
 - db/migrate/20131210212342_add_show_fee_to_memberhsip_type.rb
 - db/migrate/20131210222814_add_renewal_price_to_membership_type.rb
+- db/migrate/20131223215615_goodbye_order_view.rb
+- db/migrate/20140114011856_add_welcome_message_to_memberships.rb
+- db/migrate/20140114212127_add_send_email_to_memberships.rb
+- db/migrate/20140125183606_index_memberships_and_types.rb
+- db/migrate/20140128213101_add_pdf_to_members.rb
+- db/migrate/20140128223140_add_uuid_to_member.rb
+- db/migrate/20140128223948_add_qr_code_to_member.rb
 - lib/artfully_ose/common_abilities.rb
 - lib/artfully_ose/core_ext.rb
 - lib/artfully_ose/engine.rb
@@ -2472,8 +2504,34 @@ files:
 - lib/d2s3/view_helpers.rb
 - lib/email_validator.rb
 - lib/tasks/artfully_ose.rake
+- spec/factories/action_factories.rb
+- spec/factories/address_factories.rb
+- spec/factories/cart_factories.rb
+- spec/factories/chart_factories.rb
+- spec/factories/discount_factories.rb
+- spec/factories/donation_factories.rb
+- spec/factories/event_factories.rb
+- spec/factories/import_factories.rb
+- spec/factories/item_factories.rb
+- spec/factories/kit_factories.rb
+- spec/factories/member_factories.rb
+- spec/factories/membership_factories.rb
+- spec/factories/membership_type_factories.rb
+- spec/factories/order_factories.rb
+- spec/factories/organization_factories.rb
+- spec/factories/payments_factories.rb
+- spec/factories/person_factories.rb
+- spec/factories/phone_factories.rb
+- spec/factories/section_factories.rb
+- spec/factories/segment_factories.rb
+- spec/factories/show_factories.rb
+- spec/factories/ticket_factories.rb
+- spec/factories/ticket_offer_factories.rb
+- spec/factories/ticket_type_factories.rb
+- spec/factories/user_factories.rb
 - LICENSE.txt
 - Rakefile
+- README.md
 homepage: http://fracturedatlas.github.com/artfully_ose/
 licenses: []
 metadata: {}

data/app/controllers/membership_awards_controller.rb

@@ -1,60 +0,0 @@
-class MembershipAwardsController < ArtfullyOseController
-  requires_kit :membership
-  
-  def new
-    Rails.cache.delete(cache_key)
-
-    @membership_types = MembershipType.all
-    @membership_types_hash = {}
-    @membership_types.each {|mt| @membership_types_hash[mt.id] = I18n.l(mt.ends_at, :format => :date_for_input)}
-
-    @membership_award = MembershipAward.new
-    @membership_award.membership_type             ||= @membership_types.first
-    @membership_award.ends_at                     ||= I18n.l(@membership_types.first.ends_at, :format => :date_for_input)
-    @membership_award.send_email                  ||= true
-    @membership_award.number_of_memberships       ||= 1
-    @membership_award.people = find_people
-  end
-
-  def create
-    if params[:membership_award][:confirm].present?
-      @membership_award = from_params(params)
-      Membership.for_award(@membership_award)
-      render 'create' and return
-    else
-      @membership_award = from_params(params)
-
-      #TODO: Validate that these people are all the same org as this user
-
-      render "confirm" and return
-    end
-  end
-
-  private 
-    def from_params(params)
-      membership_award                       = MembershipAward.new
-      membership_award_params                = params[:membership_award]
-      membership_award.membership_type       = MembershipType.find(membership_award_params[:membership_type])
-      membership_award.ends_at               = membership_award_params[:ends_at]
-      membership_award.send_email            = membership_award_params[:send_email]
-      membership_award.number_of_memberships = membership_award_params[:number_of_memberships]
-      membership_award.message               = membership_award_params[:message]
-      membership_award.people                = find_people
-      membership_award
-    end
-
-    def cache_key
-      current_user.id.to_s + "membership_award_person_ids"
-    end
-
-    def find_people
-      ids = Rails.cache.fetch(cache_key) do
-        if params[:person_id].present?
-          Array.wrap(params[:person_id])
-        else
-          []
-        end
-      end
-      Array.wrap(Person.find(ids))
-    end
-end

data/app/models/database_views/order_view.rb

@@ -1,34 +0,0 @@
-class OrderView < ActiveRecord::Base
-  self.table_name = 'order_view'
-  self.primary_key = 'id'
-  has_many :items, :foreign_key => 'order_id'
-  
-  default_scope :order => 'created_at DESC'
-  scope :before, lambda { |time| where("created_at < ?", time) }
-  scope :after,  lambda { |time| where("created_at > ?", time) }
-  scope :imported, where("fa_id IS NOT NULL")
-  scope :not_imported, where("fa_id IS NULL")
-  scope :artfully, where("transaction_id IS NOT NULL")
-  
-  set_watch_for :created_at, :local_to => :self, :as => :admins
-  
-  def artfully?
-    !transaction_id.nil?
-  end
-
-
-  #
-  # If we can push these into the view (with an SQL case) then we can save having to join to items in Ruby
-  #
-  def has_ticket?
-    items.select(&:ticket?).present?
-  end
-
-  def has_donation?
-    items.select(&:donation?).present?
-  end
-  
-  def time_zone
-    "Eastern Time (US & Canada)"
-  end
-end

data/app/models/membership_award.rb

@@ -1,24 +0,0 @@
-class MembershipAward
-  extend ActiveModel::Naming
-  include ActiveModel::Conversion
-  include ActiveModel::Validations
-
-  attr_accessor :people,
-                :search, 
-                :organization, 
-                :membership_type, 
-                :number_of_memberships, 
-                :ends_at, 
-                :message, 
-                :send_email,
-                :notes,
-                :sold_price
-
-  def persisted?
-    false
-  end
-
-  def people_ids
-    people.nil? ? [] : people.collect(&:id)
-  end
-end

data/app/models/orders/pdf_generation.rb

@@ -1,75 +0,0 @@
-require 'json'
-require 'digest/md5'
-
-module Orders
-  class PdfGeneration
-    PDF_POST_URL = "http://quick-pdf.geminisbs.net/pdfs.json"
-    PDF_GET_URL = "http://quick-pdf.geminisbs.net/pdfs/:id.json?api_key=:key"
-    PDF_DOWNLOAD_URL = "http://quick-pdf.geminisbs.net/pdfs/:id/download?api_key=:key"
-
-    ERB_TEMPLATE = <<-ERB
-<h1>Your Tickets</h1>
-<% order.tickets.map(&:product).each do |ticket| %>
-  <img src="<%= ticket.qr_code_url %>" />
-<% end %>
-    ERB
-
-    def initialize(order, pdf_api_key = PDF_API_KEY, http_party = HTTParty, sleeper = Kernel)
-      @order = order
-      @pdf_api_key = pdf_api_key
-      @http_party = http_party
-      @sleeper = sleeper
-    end
-
-    def generate
-      response = http_party.post(PDF_POST_URL, pdf_attributes)
-
-      json = JSON.parse(response.body)
-      while !json["complete"]
-        response = http_party.get(status_url(json))
-        json = JSON.parse(response.body)
-
-        sleeper.sleep 1 unless json["complete"]
-      end
-
-      download_url(json)
-    end
-
-    def content
-      ERB.new(ERB_TEMPLATE).result(binding)
-    end
-
-    private
-    attr_reader :order, :pdf_api_key, :http_party, :sleeper
-
-    def pdf_attributes
-      {
-        :body => {
-          :api_key => pdf_api_key,
-          :pdf => {
-            :html_doc => content,
-            :filename => filename,
-            :pdf_options => {
-              :margin_top => "0.5in",
-              :margin_bottom => "0.5in",
-              :margin_left => "0.5in",
-              :margin_right => "0.5in"
-            }
-          }
-        }
-      }
-    end
-
-    def filename
-      "#{Digest::MD5.hexdigest order.id.to_s}.pdf"
-    end
-
-    def status_url(json)
-      PDF_GET_URL.gsub(":id", json["id"].to_s).gsub(":key", pdf_api_key)
-    end
-
-    def download_url(json)
-      PDF_DOWNLOAD_URL.gsub(":id", json["id"].to_s).gsub(":key", pdf_api_key)
-    end
-  end
-end

data/app/views/members/invitations/edit.html.erb

@@ -1,14 +0,0 @@
-<h2>Set your password</h2>
-
-<%= form_for resource, :as => resource_name, :url => invitation_path(resource_name), :html => { :method => :put } do |f| %>
-  <%= devise_error_messages! %>
-  <%= f.hidden_field :invitation_token %>
-
-  <p><%= f.label :password %><br />
-  <%= f.password_field :password %></p>
-
-  <p><%= f.label :password_confirmation %><br />
-  <%= f.password_field :password_confirmation %></p>
-
-  <p><%= f.submit "Set my password" %></p>
-<% end %>

data/app/views/membership_awards/confirm.html.haml

@@ -1,105 +0,0 @@
-.row
-  .span4
-    %h3 People
-    %table.table.people-list
-      - @membership_award.people.each do |person|
-        %tr
-          %td.name
-            = person
-            %br
-            = person.email
-  .span8
-    %h3 Details
-    %table.table
-      =form_for @membership_award do |form|  
-        %tr
-          %td Type
-          %td=@membership_award.membership_type.name
-        %tr
-          %td Number of Memberships
-          %td=@membership_award.number_of_memberships
-        %tr
-          %td Price
-          %td=number_as_cents @membership_award.sold_price
-        %tr
-          %td Expires On
-          %td=@membership_award.ends_at
-        %tr
-          %td Send Email
-          %td=@membership_award.send_email ? "Yes" : "No"
-        %tr
-          %td Email Preview
-          %td=link_to "Preview Now", "#email-preview", 'data-toggle' => 'modal'
-
-    - if @membership_award.people.length == 1
-      %h3 Payment
-      .row-fluid
-        .span5
-          #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', :disabled => 'true', :humanized_value => 'Comp')
-              Comp
-            %label.radio
-              = radio_button_tag(:payment_method, :credit_card_manual, false, :class => 'payment-method', :humanized_value => 'Credit card')
-              Credit
-        .span7
-          #payment-info.hidden.well
-            .control-group
-              = label_tag("credit_card[cardholder_name]", "Name on Card")
-              .controls= text_field_tag("credit_card[name]", params[:cardholder_name])
-            .control-group
-              = label_tag("credit_card[card_number]", "Card Number")
-              .controls= text_field_tag("credit_card[number]", params[:card_number])
-            .control-group
-              = label_tag("credit_card[expiration_date]", "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')
-
-    %h3 What Happens Now?
-    %p 
-      =check_mark
-      These people will become members of your organization. 
-    %p 
-      =check_mark
-      The credit card you provided will be charged . 
-    -if @membership_award.send_email
-      %p 
-        =check_mark
-        They will get an email to setup an account with your orgnaization if they have not already done so.
-        =link_to "Click here to see a preview of this email", "#email-preview", 'data-toggle' => 'modal'
-
-    =form_for @membership_award do |form| 
-      =form.hidden_field :membership_type, :value => @membership_award.membership_type.id
-      =form.hidden_field :number_of_memberships
-      =form.hidden_field :sold_price
-      =form.hidden_field :ends_at
-      =form.hidden_field :send_email
-      =form.hidden_field :message
-      =form.hidden_field :confirm, :value => true
-      .form-actions
-        =form.submit "Next", :class => 'btn'
-
-    #email-preview.modal
-      .modal-header
-        .close{'data-dismiss'=>'modal'} x
-        %h3 Email Preview
-      .modal-body
-        =@membership_award.message
-      .modal-footer
-        %button.btn{'data-dismiss'=>'modal'} Close
-
--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");
-      }
-    });