artfully_ose 1.0.0.rc4 → 1.1.0.rc1

data/app/views/users/registrations/edit.html.erb

@@ -20,6 +20,6 @@
 
 <h3>Cancel my account</h3>
 
-<p>Unhappy? <%= link_to "Cancel my account", registration_path(resource_name), :confirm => "Are you sure you want to cancel your account?", :method => :delete %>.</p>
+<p>Unhappy? <%= link_to "Cancel my account", registration_path(resource_name), :data => {:confirm => "Are you sure you want to cancel your account?"}, :method => :delete %>.</p>
 
 <%= link_to "Back", :back %>

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

@@ -45,3 +45,4 @@
           
       .form-actions
         = form.submit "Save", :class => 'btn'
+        = form.submit "Save & Next".html_safe, :class => 'btn btn-primary'

data/config/artfully.yml.sample

@@ -3,7 +3,10 @@
 ---
 development:
   ticket_fee: 0
+  contact_email: support@replaceme.com
 test:
   ticket_fee: 0
+  contact_email: support@replaceme.com
 production:
   ticket_fee: 0
+  contact_email: support@replaceme.com

data/config/initializers/active_model_serializer.rb

@@ -0,0 +1,3 @@
+::ActiveSupport.on_load(:active_model_serializers) do
+  ActiveModel::ArraySerializer.root = false
+end

data/config/initializers/braintree_error_mapping.rb

@@ -0,0 +1,5 @@
+BRAINTREE_GENERIC_REJECT = "We're sorry but we could not process your credit card.  Please check the details and try again."
+
+BRAINTREE_REJECT_MESSAGE_MAPPING = Hash.new(BRAINTREE_GENERIC_REJECT)
+BRAINTREE_REJECT_MESSAGE_MAPPING["CVV must be 4 digits for American Express and 3 digits for other card types (81707)"] = "CVV is invalid. CVV must be 4 digits for American Express and 3 digits for other card types."
+BRAINTREE_REJECT_MESSAGE_MAPPING["2004 Expired Card"] = "We're sorry but we could not process your credit card.  It looks like your card has expired."

data/config/initializers/devise.rb

@@ -3,7 +3,7 @@
 Devise.setup do |config|
   # ==> Mailer Configuration
   # Configure the e-mail address which will be shown in DeviseMailer.
-  config.mailer_sender = "support@artful.ly"
+  config.mailer_sender = ARTFULLY_CONFIG[:contact_email]
   config.case_insensitive_keys = [ :email ]
   config.use_salt_as_remember_token = true
   config.reset_password_within = 24.hours

data/config/locales/en.yml

@@ -25,6 +25,7 @@
       short: "%m/%d/%Y %I:%M %p"
       slashed_date: "%m/%d/%Y"
       day_time: "%a, %b %d %l:%M %P"
+      day_time_at: "%a, %b %d at %I:%M %P"
       date: "%B %d, %Y"
       long_date: "%B %d, %Y %I:%M %p"
       long_with_day: "%A, %b, %d %Y %I:%M %p"

data/config/routes.rb

@@ -58,7 +58,13 @@ Rails.application.routes.draw do
   end
 
   resources :reports, :only => :index
-  resources :statements, :only => [ :index, :show ]
+  resources :statements, :only => [ :index, :show ] do
+    resources :slices, :only => [ :index ] do
+      collection do
+        get :data
+      end
+    end
+  end
 
   resources :people, :except => :destroy do
     resources :actions
@@ -66,15 +72,30 @@ Rails.application.routes.draw do
     resources :phones, :only => [:create, :destroy]
     resource  :address, :only => [:create, :update, :destroy]
   end
-  resources :segments
+  resources :searches, :only => [:new, :create, :show] do
+    resources :actions, :only => [:new, :create]
+    member do
+      post :tag
+    end
+  end
+  resources :segments, :only => [:index, :show, :create, :destroy] do
+    resources :actions, :only => [:new, :create]
+    member do
+      post :tag
+    end
+  end
 
   resources :events do
-    get :widget,  :on => :member
-    get :storefront_link,  :on => :member
-    get :resell, :on => :member
-    get :prices,  :on => :member
-    get :image,   :on => :member
-    get :messages,   :on => :member
+    member do
+      get :widget
+      get :storefront_link
+      get :resell
+      get :wp_plugin
+      get :prices
+      get :image
+      get :messages
+    end
+    resources :discounts
     resources :shows do
       resource :sales, :only => [:new, :create, :show, :update]
       member do
@@ -141,6 +162,8 @@ Rails.application.routes.draw do
     end
   end
 
+  resources :discounts_reports, :only => [:index]
+
   match '/events/:event_id/charts/' => 'events#assign', :as => :assign_chart, :via => "post"
   match '/people/:id/star/:type/:action_id' => 'people#star', :as => :star, :via => "post"
   match '/people/:id/tag/' => 'people#tag', :as => :new_tag, :via => "post"

data/db/migrate/0000_set_up_artfully.rb

@@ -14,7 +14,7 @@ class SetUpArtfully < ActiveRecord::Migration
       t.integer  "subject_id"
       t.string   "subject_type"
       t.integer  "creator_id"
-          end
+    end
 
     create_table "addresses" do |t|
       t.string   "address1"
@@ -26,7 +26,7 @@ class SetUpArtfully < ActiveRecord::Migration
       t.integer  "person_id"
       t.datetime "created_at"
       t.datetime "updated_at"
-          end
+    end
 
     add_index "addresses", ["person_id"], :name => "index_addresses_on_person_id"
 
@@ -43,7 +43,6 @@ class SetUpArtfully < ActiveRecord::Migration
       t.boolean "is_template"
       t.integer "event_id"
       t.integer "organization_id"
-      
     end
 
     create_table "delayed_jobs" do |t|
@@ -77,7 +76,7 @@ class SetUpArtfully < ActiveRecord::Migration
       t.integer  "organization_id"
       t.datetime "created_at"
       t.datetime "updated_at"
-            t.datetime "deleted_at"
+      t.datetime "deleted_at"
       t.string   "contact_phone"
       t.string   "contact_email"
       t.text     "description"
@@ -133,7 +132,7 @@ class SetUpArtfully < ActiveRecord::Migration
       t.integer  "show_id"
       t.datetime "created_at"
       t.datetime "updated_at"
-          end
+    end
 
     add_index "items", ["created_at"], :name => "index_items_on_created_at"
     add_index "items", ["order_id"], :name => "index_items_on_order_id"
@@ -173,7 +172,7 @@ class SetUpArtfully < ActiveRecord::Migration
       t.datetime "updated_at"
       t.integer  "service_fee"
       t.string   "details"
-            t.string   "type"
+      t.string   "type"
       t.string   "payment_method"
       t.text     "special_instructions"
     end
@@ -203,7 +202,7 @@ class SetUpArtfully < ActiveRecord::Migration
       t.boolean  "dummy"
       t.datetime "created_at"
       t.datetime "updated_at"
-            t.string   "person_type"
+      t.string   "person_type"
       t.string   "twitter_handle"
       t.string   "facebook_url"
       t.string   "linked_in_url"
@@ -228,7 +227,6 @@ class SetUpArtfully < ActiveRecord::Migration
       t.integer "capacity"
       t.integer "price"
       t.integer "chart_id"
-      
       t.text    "description"
     end
 
@@ -237,14 +235,14 @@ class SetUpArtfully < ActiveRecord::Migration
       t.string  "terms"
       t.integer "organization_id"
     end
-
+    
     create_table "shows" do |t|
       t.string   "state"
       t.datetime "datetime"
       t.integer  "event_id"
       t.integer  "chart_id"
       t.integer  "organization_id"
-          end
+    end
 
     add_index "shows", ["event_id"], :name => "index_shows_on_event_id"
     add_index "shows", ["organization_id"], :name => "index_shows_on_organization_id"
@@ -278,7 +276,7 @@ class SetUpArtfully < ActiveRecord::Migration
       t.datetime "created_at"
       t.datetime "updated_at"
       t.integer  "cart_id"
-            t.integer  "section_id"
+      t.integer  "section_id"
     end
 
     add_index "tickets", ["cart_id"], :name => "index_tickets_on_cart_id"

data/db/migrate/20120809212802_add_do_not_email_to_people.rb

@@ -0,0 +1,5 @@
+class AddDoNotEmailToPeople < ActiveRecord::Migration
+  def change
+    add_column :people, :do_not_email, :boolean, :default => false
+  end
+end

data/db/migrate/20120831200120_create_advanced_search.rb

@@ -0,0 +1,30 @@
+class CreateAdvancedSearch < ActiveRecord::Migration
+  def change
+    create_table :segments, :force => true do |t|
+      t.string  :name,            :null => false
+      t.integer :organization_id, :null => false
+      t.integer :search_id,       :null => false
+
+      t.timestamps
+    end
+    add_index :segments, :organization_id
+    add_index :segments, :search_id
+
+    create_table "searches" do |t|
+      t.integer  "organization_id",      :null => false
+      t.string   "zip"
+      t.string   "state"
+      t.integer  "event_id"
+      t.integer  "min_lifetime_value"
+      t.integer  "min_donations_amount"
+      t.integer  "max_lifetime_value"
+      t.integer  "max_donations_amount"
+      t.datetime "min_donations_date"
+      t.datetime "max_donations_date"
+      t.string   "tagging"
+
+      t.timestamps
+    end
+    add_index :searches, :organization_id
+  end
+end

data/db/migrate/20120926201927_add_email_to_organization.rb

@@ -0,0 +1,5 @@
+class AddEmailToOrganization < ActiveRecord::Migration
+  def change
+    add_column :organizations, :email, :string
+  end
+end

data/db/migrate/20121001143351_add_import_id_orders_events.rb

@@ -0,0 +1,6 @@
+class AddImportIdOrdersEvents < ActiveRecord::Migration
+  def change
+      add_column :orders, :import_id, :integer 
+      add_column :events, :import_id, :integer
+  end
+end

data/db/migrate/20121006024736_add_import_to_actions.rb

@@ -0,0 +1,5 @@
+class AddImportToActions < ActiveRecord::Migration
+  def change
+    add_column :actions, :import_id, :integer
+  end
+end

data/db/migrate/20121011180654_add_type_to_imports.rb

@@ -0,0 +1,14 @@
+class AddTypeToImports < ActiveRecord::Migration
+  def up
+    add_column :imports, :type, :string
+  
+    Import.all.each do |i|
+      i.type = "PeopleImport"
+      i.save
+    end
+  end
+  
+  def down
+    remove_column :imports, :type
+  end
+end

data/db/migrate/20121024143846_create_discounts.rb

@@ -0,0 +1,15 @@
+class CreateDiscounts < ActiveRecord::Migration
+  def change
+    create_table :discounts do |t|
+      t.string :code, :null => false
+      t.boolean :active, :null => false, :default => true
+      t.string :promotion_type, :null => false
+      t.text :properties
+      t.integer :event_id, :null => false
+      t.integer :organization_id, :null => false
+      t.integer :user_id, :null => false
+
+      t.timestamps
+    end
+  end
+end

data/db/migrate/20121026131454_deleted_at_to_orders_items_actions.rb

@@ -0,0 +1,7 @@
+class DeletedAtToOrdersItemsActions < ActiveRecord::Migration
+  def change
+    add_column :orders,   :deleted_at, :datetime
+    add_column :actions,  :deleted_at, :datetime
+    add_column :items,    :deleted_at, :datetime
+  end
+end

data/db/migrate/20121026203948_add_initial_price_to_tickets.rb

@@ -0,0 +1,5 @@
+class AddInitialPriceToTickets < ActiveRecord::Migration
+  def change
+    add_column :tickets, :initial_price, :integer
+  end
+end

data/db/migrate/20121029183949_change_initial_price_to_cart_price.rb

@@ -0,0 +1,5 @@
+class ChangeInitialPriceToCartPrice < ActiveRecord::Migration
+  def change
+    rename_column :tickets, :initial_price, :cart_price
+  end
+end

data/db/migrate/20121113144826_migrate_donation_types.rb

@@ -0,0 +1,41 @@
+class MigrateDonationTypes < ActiveRecord::Migration
+  def update_action_and_order(action, new_subtype, payment_method=nil)
+    puts "Fixing Action #{action.id} -----------------------------------------"
+    puts "Old subtype #{action.subtype}"
+    puts "New subtype #{new_subtype}"
+    action.subtype = new_subtype
+    saved = action.save
+    puts "Saved #{saved}"
+    
+    if action.subject.nil?
+      puts "No order found"
+    elsif payment_method.nil?
+      puts "No change to payment method"
+    else
+      puts "Fixing Order #{action.subject.id}"
+      puts "Old payment method #{action.subject.payment_method}"
+      puts "New payment method #{payment_method}"
+      action.subject.payment_method = payment_method
+      saved = action.subject.save
+      puts "Saved #{saved}"
+    end
+  end
+  
+  def change
+    Action.where(:subtype => 'Donation').each do |action|
+      update_action_and_order(action, "Monetary")
+    end
+    
+    Action.where(:subtype => 'Donation (Cash)').each do |action|
+      update_action_and_order(action, "Monetary", "Cash")
+    end
+    
+    Action.where(:subtype => 'Donation (Check)').each do |action|
+      update_action_and_order(action, "Monetary", "Check")
+    end
+    
+    Action.where(:subtype => 'Donation (In-Kind)').each do |action|
+      update_action_and_order(action, "In-Kind", "Other")
+    end
+  end
+end

data/db/migrate/20121115020441_add_salutation_to_people.rb

@@ -0,0 +1,5 @@
+class AddSalutationToPeople < ActiveRecord::Migration
+  def change
+    add_column :people, :salutation, :string, :default => nil
+  end
+end

data/db/migrate/20121130004314_add_visibility_to_sections.rb

@@ -0,0 +1,6 @@
+class AddVisibilityToSections < ActiveRecord::Migration
+  def change
+    add_column :sections, :storefront, :boolean, :default => 1
+    add_column :sections, :box_office, :boolean, :default => 1
+  end
+end

data/db/migrate/20121205184343_add_discount_to_ticket.rb

@@ -0,0 +1,6 @@
+class AddDiscountToTicket < ActiveRecord::Migration
+  def change
+    add_column :tickets, :discount_id, :integer
+    add_index :tickets, :discount_id
+  end
+end

data/db/migrate/20121206212835_add_discount_to_carts_and_items.rb

@@ -0,0 +1,7 @@
+class AddDiscountToCartsAndItems < ActiveRecord::Migration
+  def change
+    add_column :carts, :discount_id, :integer
+    add_column :items, :discount_id, :integer
+    add_index :items, :discount_id
+  end
+end

data/db/migrate/20121211193728_add_deleted_at_to_discounts.rb

@@ -0,0 +1,5 @@
+class AddDeletedAtToDiscounts < ActiveRecord::Migration
+  def change
+    add_column :discounts, :deleted_at, :datetime
+  end
+end

data/db/migrate/20121212022026_add_uuid_to_show_and_event.rb

@@ -0,0 +1,9 @@
+class AddUuidToShowAndEvent < ActiveRecord::Migration
+  def change
+    add_column :events, :uuid, :string
+    add_column :shows , :uuid, :string
+    
+    add_index  :events, :uuid
+    add_index  :shows , :uuid
+  end
+end

data/db/migrate/20121212023203_set_uuids.rb

@@ -0,0 +1,11 @@
+class SetUuids < ActiveRecord::Migration
+  def change
+    Event.all.each do |event|
+      event.update_column(:uuid, Ext::Uuid.uuid)
+    end
+    
+    Show.all.each do |show|
+      show.update_column(:uuid, Ext::Uuid.uuid)
+    end
+  end
+end

data/db/migrate/20121217201422_add_minimum_ticket_count_to_discounts.rb

@@ -0,0 +1,5 @@
+class AddMinimumTicketCountToDiscounts < ActiveRecord::Migration
+  def change
+    add_column :discounts, :minimum_ticket_count, :integer
+  end
+end