artfully_ose 1.2.0.pre.27 → 1.2.0

data/app/views/store/checkouts/thanks.html.haml

@@ -22,12 +22,12 @@
         %p
            
 
-        %p 
+        %p
           - if @order.total_with_service_fee > 0
             %b You will see a charge on your credit card statement from "Artful.ly"
-            %br 
             %br
-          Check your email! We've sent a confirmation of this order to 
+            %br
+          Check your email! We've sent a confirmation of this order to
           %b=@order.person.email
           - if @fafs_success == true
             %p Thank you for your donation! You will receive a separate email confirmation for that donation.
@@ -65,6 +65,14 @@
                   %tr
                     %td="Donation to #{@store_organization.name}"
                     %td.right=number_as_cents item.total_price
+                  %tr
+                    %td{:colspan => 2, :style => 'text-align: center; border-top: 0 none;'}
+                      = image_tag('/assets/glyphish/gray/29-heart@2x.png')
+                      %br
+                      %strong
+                        Thanks for your support!
+                      %br
+                        %p{:style => 'text-align: left;'}= @store_organization.kit(:regular_donation).thanks_msg_text
 
             -unless @order.passes.empty?
               %h4 Passes
@@ -105,11 +113,11 @@
             -if !@order.organization.has_kit? :scannable_tickets
               %p
                 %b Physical tickets will not be issued for this event. Please check in at the door with your order number.
-            %p 
+            %p
               For questions about this event please contact:
               %br
               -unless event.contact_email.blank?
-                Contact email: 
+                Contact email:
                 %b=event.contact_email
               %br
               -unless event.contact_phone.blank?
@@ -123,4 +131,4 @@
                 .address-block
                   %br
                   =event.venue.name
-                  %div="#{event.venue.street_as_string}, #{event.venue.city_state_zip_as_string}"
+                  %div="#{event.venue.street_as_string}, #{event.venue.city_state_zip_as_string}"

data/app/views/store/donations/index.html.haml

@@ -1,2 +1,19 @@
-%h2="Donate to #{@store_organization.name}"
-=render "store/shared/donate_form"
+- donation_kit = @donation_kit || @store_organization.kit(:regular_donation)
+.row
+  .span6.offset3#donate-now-container
+    #donate-now-header
+      .center
+        %h4="Donate to"
+        %h1="#{@store_organization.name}"
+
+    - if donation_kit.about_organization_text.present?
+      .organization-about
+        = donation_kit.about_organization_text.html_safe
+        %hr
+
+    - if donation_kit.donation_ask_text.present?
+      .donation-ask
+        = donation_kit.donation_ask_text.html_safe
+        %hr
+    #donate-now
+      = render 'store/shared/donate_form'

data/app/views/store/events/calendar.html.haml

@@ -3,6 +3,7 @@
 .container#multi-show-container
   #event-header
     %h1#logo= @event.name
+    %h4= @event.subtitle
     %h4= @event.producer
 
   .row

data/app/views/store/events/index.html.haml

@@ -12,6 +12,7 @@
           .span9
             #event-header
               %h1=event.name
+              %h4=event.subtitle
             %p
               =simple_format event.description
             %p

data/app/views/store/events/show.html.haml

@@ -3,6 +3,7 @@
 .container#multi-show-container
   #event-header
     %h1#logo= @event.name
+    %h4= @event.subtitle
     %h4= @event.producer
 
   .row

data/app/views/store/events/single_show.html.haml

@@ -7,6 +7,8 @@
 
       #event-header.side-section
         %h1#logo= @event.name
+        -if @event.subtitle
+          #subtitle= @event.subtitle 
         %h4= @event.producer
         %h4= @event.shows.first.show_time
 

data/app/views/store/orders/show.html.haml

@@ -75,8 +75,8 @@
 
           = link_to "Clear My Cart", store_order_path, :method => :delete, :data => { :confirm => 'Are you sure you want to empty your cart?' }
 
-        =render "store/shared/donate_form"
-
+        - if @store_organization.has_kit?(:regular_donation) || @store_organization.has_kit?(:sponsored_donation)
+          = render 'store/shared/small_donate_form'
 
     .span7
       -unless current_cart.empty?
@@ -141,17 +141,17 @@
                   .control-group
                     = card.label :name, "Cardholder Name", :class => 'control-label'
                     .controls= card.text_field :name, :class => 'required'
-                    
+
                   .control-group
                     = card.label :number, "Card Number", :class => 'control-label'
                     .controls= card.text_field :number, :class => 'required'
-                    
+
                   .control-group
                     = card.label :verification_value, "CVV", :class => 'control-label'
                     .controls
                       = card.text_field :verification_value, :class => 'required span1'
                       = image_tag 'storefront/cvv.gif'
-                      
+
                   .control-group
                     = card.label :expiration, "Expiration", :class => 'control-label'
                     .controls
@@ -175,10 +175,10 @@
             .control-group
               .controls
                 %label.checkbox
-                  I have read, understand and accept the terms and conditions of the 
+                  I have read, understand and accept the terms and conditions of the
                   =link_to "User Agreement", "#user-agreement-modal", 'data-toggle' => 'modal'
                   = check_box_tag "payment[user_agreement]", 1, false, :class => 'required-checkbox', :id => 'agreement-checkbox'
-              
+
             = hidden_field_tag :confirmation, 1
             .form-actions.cart-actions
               %h4.cart-error-message Please correct the errors above
@@ -186,13 +186,13 @@
                 .span8
                   %h2#cart-total= number_as_cents current_cart.total
                 .span4
-                  = submit_tag 'Buy Now', :id => 'complete-purchase', :class => 'btn btn-primary btn-large pull-right'  
+                  = submit_tag 'Buy Now', :id => 'complete-purchase', :class => 'btn btn-primary btn-large pull-right'
 
     #user-agreement-modal.modal.hide
       .modal-header
         .close{'data-dismiss'=>'modal'} x
-        %h3 Artful.ly User Agreement    
+        %h3 Artful.ly User Agreement
       .modal-body
         = t("pages.user_agreement.content", :default => "")
       .modal-footer
-        =link_to "Close", "#", :class => "btn", 'data-dismiss'=>'modal' 
+        =link_to "Close", "#", :class => "btn", 'data-dismiss'=>'modal'

data/app/views/store/passes/index.html.haml

@@ -17,7 +17,7 @@
                 .title.active
                   .price
                     =number_as_cents pass_type.price
-                  .membership_type_name
+                  .pass_type_name
                     =pass_type.name
             =pass_type.description
             %br
@@ -26,7 +26,7 @@
               = form_for pass_type, :as => :pass_type, :url => store_order_path(@store_organization.cached_slug), :html => {:id => "edit_pass_type_#{pass_type.id}"}, :method => :post do |f| 
                 = f.hidden_field :id
                 = select_tag :quantity, options_for_select((1..6).to_a.map {|i| [pluralize(i, "#{pass_type.passerize}"), i]})
-                = f.submit 'Add to cart', :class => 'btn btn-primary', :style => 'margin-top: -10px'
+                = f.submit 'Add to cart', :class => 'add-to-cart btn btn-primary', :style => 'margin-top: -10px'
       
     .span4
       .side-section

data/app/views/store/shared/_donate_form.html.haml

@@ -1,12 +1,31 @@
-- if @store_organization.authorization_hash[:authorized]
-  #donation.side-section
-    %h6 Donate
-    - if @store_organization.authorization_hash[:type] == :sponsored
-      %p="#{@store_organization.authorization_hash[:fsp_name]} is a fiscally sponsored project of Fractured Atlas, a non-profit arts service organization. Donations for the purposes of #{@store_organization.authorization_hash[:fsp_name]} must be made payable to Fractured Atlas and are tax-deductible to the extent permitted by law."
-    - else
-      %p Help support our work by adding a donation to your order! Donations are tax-deductible to the extent permitted by law.
-    = form_tag store_order_path(@store_organization.cached_slug), :method => :post, :class => 'add-donation-to-cart form-inline' do
-      .input-prepend
-        %span.add-on $
-        = text_field_tag :donation_amount, '', :class => 'span1'
-      = submit_tag 'Add Donation', :class => 'btn btn-primary', :id => 'add-donation'
+- donation_kit = @donation_kit || @store_organization.kit(:regular_donation)
+= form_tag store_order_path(@store_organization.cached_slug), :method => :post, :class => 'add-donation-to-cart form-inline' do
+  = hidden_field_tag :_source, 'storefront'
+
+  - if donation_kit.suggested_gifts.present? && donation_kit.suggested_gifts.any?
+    - donation_kit.suggested_gifts.each_with_index do |suggested_gift, index|
+      .preset-amount
+        %label{:for => "suggested_gift_#{index}", :class => 'control-label inline radio'}
+          - label_text = suggested_gift['level_name'].present? ? "#{suggested_gift['level_name']} ($#{format('%.2f', suggested_gift['amount'])})" : "$#{format('%.2f', suggested_gift['amount'])}"
+          = radio_button_tag :suggested_gift, suggested_gift['amount'], false, :id => "suggested_gift_#{index}", :class => 'preset_radio'
+          = label_text
+
+    - if donation_kit.open_gift_field == '1'
+      .preset-amount
+        %label{:for => :suggested_gift_42, :class => 'control-label inline radio'}
+          = radio_button_tag :suggested_gift, 0, false, :id => 'suggested_gift_42', :class => 'preset_radio'
+          Other
+
+        .input-prepend
+          %span.add-on $
+          = text_field_tag :donation_amount, '', :class => 'span1'
+    = hidden_field_tag :donation_amount_fixed, ''
+
+    %br{:style => 'clear: both;'}
+    = submit_tag 'Add Donation', :class => 'btn btn-primary', :id => 'add-donation'
+
+  - else
+    .input-prepend
+      %span.add-on $
+      = text_field_tag :donation_amount, '', :class => 'span1'
+    = submit_tag 'Add Donation', :class => 'btn btn-primary', :id => 'add-donation'

data/app/views/store/shared/_small_donate_form.html.haml

@@ -0,0 +1,22 @@
+- donation_kit = @donation_kit || @store_organization.kit(:regular_donation)
+%h6 Donate
+
+- if donation_kit
+  -if donation_kit.donation_nudge_text.present?
+    %p= donation_kit.donation_nudge_text
+  -else
+    %p
+      Help support our work by adding a donation to your order!
+      %br
+      Donations are tax-deductible to the extent permitted by law.
+- else @store_organization.authorization_hash[:type] == :sponsored
+  %p= "#{@store_organization.authorization_hash[:fsp_name]} is a fiscally sponsored project of Fractured Atlas, a non-profit arts service organization. Donations for the purposes of #{@store_organization.authorization_hash[:fsp_name]} must be made payable to Fractured Atlas and are tax-deductible to the extent permitted by law."
+
+= form_tag store_order_path(@store_organization.cached_slug), :method => :post, :class => 'add-donation-to-cart form-inline' do
+  = hidden_field_tag :_source, 'cart'
+  .preset-amount.last
+    .input-prepend
+      %span.add-on $
+      = text_field_tag :donation_amount, '', :class => 'span1'
+
+    = submit_tag 'Add Donation', :class => 'btn btn-primary', :id => 'add-donation'

data/app/views/users/invitations/edit.html.haml

@@ -5,14 +5,8 @@
   %strong=resource.user_memberships.first.organization.name
   has invited you to join their organization.  Enter a password for your account and click 'Sign Up' to begin using Artfully!
 
-%fieldset.ng-cloak{"ng-controller" => "SignInCtrl"}
-  %ul.nav.nav-tabs
-    %li{"ng-class" => "{active: signinform == 'artfully'}"}
-      %a{href: "#", "ng-click" => "signinform = 'artfully'"} Create Account
-    %li{"ng-class" => "{active: signinform == 'fa'}"}
-      %a{href: "#", "ng-click" => "signinform = 'fa'"} Sign In with Fractured Atlas
-
-  = form_for resource, as: resource_name, url: invitation_path(resource_name), html: {method: :put, class: "form-horizontal", "ng-show" => "signinform == 'artfully'"} do |f|
+%fieldset
+  = form_for resource, as: resource_name, url: invitation_path(resource_name), html: {method: :put, class: "form-horizontal"} do |f|
     = devise_error_messages!
     = f.hidden_field :invitation_token
 
@@ -31,38 +25,5 @@
     .control-group
       = f.label :password_confirmation, "Retype Password", :class => 'control-label'
       .controls= f.password_field :password_confirmation, :required => true, tabindex: "5"
-    .control-group
-      .controls
-        %label.checkbox
-          = f.check_box :user_agreement, required: true, tabindex: "6"
-          I have read, understand and accept the terms and conditions of the #{link_to "User Agreement", user_agreement_path, :target => "_blank"}
-    .form-actions
-      %p= f.submit "Sign Up", class: "btn btn-primary btn-large", tabindex: "7"
-
-  = form_for resource, as: resource_name, url: invitation_path(resource_name), html: {method: :put, class: 'form-horizontal', "ng-show" => "signinform == 'fa'"} do |f|
-    = devise_error_messages!
-    = hidden_field_tag :fa, 'true'
-    = f.hidden_field :invitation_token
-
-    .control-group
-      = f.label :email, 'Fractured Atlas Username', class: 'control-label'
-      .controls
-        = f.text_field :email, required: true, tabindex: "8", value: nil
-    .control-group
-      = f.label :password, class: 'control-label'
-      .controls
-        = f.password_field :password, required: true, tabindex: "9"
-        %p.help-block= link_to "Forgot your password?", "http://www.fracturedatlas.org/site/login/forgotten", :target => "_blank"
-
-    .control-group
-      .controls
-        %label.checkbox
-          = f.check_box :user_agreement, required: true, tabindex: "10"
-          I have read, understand and accept the terms and conditions of the #{link_to "User Agreement", user_agreement_path, :target => "_blank"}
     .form-actions
-      = f.submit "Sign Up", :class => "btn btn-primary btn-large", tabindex: "11"
-:javascript
-  var SignInCtrl = function($scope) {
-    console.log(window);
-    $scope.signinform = window.location.hash.slice(1) || 'artfully';
-  };
+      %p= f.submit "Sign Up", class: "btn btn-primary btn-large", tabindex: "7"

data/config/locales/en.yml

@@ -184,6 +184,8 @@
         ends_at: "Membership ends"
       pass_type:
         tickets_allowed: "Number of Tickets"
+        starts_at: "Pass Starts"
+        ends_at: "Pass Ends"
       organization:
         # Blithering hack to get around Rails' miserable validation message handling
         cached_slug: "Sorry,"
@@ -216,7 +218,7 @@
       on_sale: "In Widget"
       off_sale: "Not in Widget"
 
-  regular_donation_kit: "Charity Donation Kit"
+  regular_donation_kit: "501(c)(3) Donation Kit"
   sponsored_donation_kit: "Sponsored Donation Kit"
   ticketing_kit: "Paid Event Ticketing Kit"
   reseller_kit: "Reseller Kit"

data/config/routes.rb

@@ -121,6 +121,8 @@ Rails.application.routes.draw do
   resources :passes_kits, :only => [ :edit, :update ]
   resources :passes_reports, :only => [:index]
 
+  resources :regular_donation_kits, :only => [ :edit, :update ]
+
   resources :reports, :only => :index
   resources :statements, :only => [ :index, :show ] do
     resources :slices, :only => [ :index ] do
@@ -144,7 +146,7 @@ Rails.application.routes.draw do
       collection do
         post :bulk_update
       end
-    end    
+    end
 
     member do
       post :reset_password
@@ -284,6 +286,7 @@ Rails.application.routes.draw do
     resource :assignment, :only => [ :new, :create ]
     collection do
       get :membership
+      get :passes
       get :sales
     end
     member do

data/db/migrate/20140603200735_add_subtitle_to_events.rb

@@ -0,0 +1,5 @@
+class AddSubtitleToEvents < ActiveRecord::Migration
+  def change
+    add_column :events, :subtitle, :string
+  end
+end

data/lib/artfully_ose/version.rb

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

data/spec/factories/kit_factories.rb

@@ -3,8 +3,9 @@ FactoryGirl.define do
     organization
   end
 
-  factory :regular_donation_kit do
-    organization
+  factory :regular_donation_kit do |t|
+    t.association :organization
+    t.settings { { :open_gift_field => "1", :donation_only_storefront => '1'}  }
   end
 
   factory :sponsored_donation_kit do
@@ -14,12 +15,12 @@ FactoryGirl.define do
   factory :reseller_kit do
     organization
   end
-  
+
   factory :mailchimp_kit do |t|
     t.association :organization
     t.settings { { :api_key => "api_key-us5", :attached_lists => [{:list_id => "88a334b", :list_name => "First List"}] } }
   end
-  
+
   factory :membership_kit do |t|
     t.association :organization
     t.settings { { :marketing_copy_heading => "Top", :marketing_copy_sidebar => "Sidebar" }  }

metadata

@@ -1,27 +1,27 @@
 --- !ruby/object:Gem::Specification
 name: artfully_ose
 version: !ruby/object:Gem::Version
-  version: 1.2.0.pre.27
+  version: 1.2.0
 platform: ruby
 authors:
 - Artful.ly
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-07-24 00:00:00.000000000 Z
+date: 2014-11-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: 3.2.12
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: 3.2.12
 - !ruby/object:Gem::Dependency
@@ -98,14 +98,14 @@ dependencies:
   name: exceptional
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: 2.0.33
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: 2.0.33
 - !ruby/object:Gem::Dependency
@@ -336,14 +336,14 @@ dependencies:
   name: s3
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: 0.3.11
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: 0.3.11
 - !ruby/object:Gem::Dependency
@@ -1846,13 +1846,14 @@ files:
 - app/assets/javascripts/application.js
 - app/assets/javascripts/bootstrap-wysihtml5.js
 - app/assets/javascripts/bootstrap.js
-- app/assets/javascripts/box-office.js
+- app/assets/javascripts/boxoffice.js
 - app/assets/javascripts/change-membership.js
 - app/assets/javascripts/custom/door-list.js
 - app/assets/javascripts/custom/endless-scroll.js
 - app/assets/javascripts/custom/grouped-form.js
 - app/assets/javascripts/custom/imports.js
 - app/assets/javascripts/custom/inline-people-search.js
+- app/assets/javascripts/custom/kits-config.js
 - app/assets/javascripts/custom/modernizr.custom.12828.js
 - app/assets/javascripts/custom/people.js
 - app/assets/javascripts/custom/prices.js
@@ -1888,12 +1889,14 @@ files:
 - app/assets/stylesheets/bootstrap-overrides.css
 - app/assets/stylesheets/bootstrap-wysihtml5.css
 - app/assets/stylesheets/bootstrap.css
+- app/assets/stylesheets/boxoffice.css.scss
 - app/assets/stylesheets/font-awesome.css.scss
 - app/assets/stylesheets/jquery/chosen.scss
 - app/assets/stylesheets/jquery/fullcalendar.css
 - app/assets/stylesheets/jquery/jquery-ui.css
 - app/assets/stylesheets/jquery/jquery.gritter.css
 - app/assets/stylesheets/jquery/jquery.visualize.css
+- app/assets/stylesheets/pages/bootstrap-responsive.css
 - app/assets/stylesheets/printing.css
 - app/assets/stylesheets/reset.css
 - app/assets/stylesheets/sass/_colors.sass
@@ -1913,6 +1916,7 @@ files:
 - app/concerns/itemable.rb
 - app/concerns/oh_noes.rb
 - app/concerns/pdf_generation.rb
+- app/concerns/search_by_dates.rb
 - app/concerns/unrefundable.rb
 - app/controllers/actions_controller.rb
 - app/controllers/addresses_controller.rb
@@ -1961,6 +1965,7 @@ files:
 - app/controllers/people_controller.rb
 - app/controllers/phones_controller.rb
 - app/controllers/refunds_controller.rb
+- app/controllers/regular_donation_kits_controller.rb
 - app/controllers/relationships_controller.rb
 - app/controllers/returns_controller.rb
 - app/controllers/sales_controller.rb
@@ -2118,8 +2123,10 @@ files:
 - app/models/organization_ability.rb
 - app/models/parsed_row.rb
 - app/models/pass.rb
+- app/models/pass_sale_search.rb
 - app/models/pass_summary.rb
 - app/models/pass_type.rb
+- app/models/passes_report.rb
 - app/models/payment.rb
 - app/models/payments/cash_payment.rb
 - app/models/payments/check_payment.rb
@@ -2171,6 +2178,7 @@ files:
 - app/models/valuation/lifetime_value.rb
 - app/models/venue.rb
 - app/presenters/event_presenter.rb
+- app/serializers/show_serializer.rb
 - app/views/actions/_action.html.haml
 - app/views/actions/_form.html.haml
 - app/views/actions/_inline.html.haml
@@ -2243,6 +2251,7 @@ files:
 - app/views/households/new.html.haml
 - app/views/households/show.html.haml
 - app/views/households/suggested.html.haml
+- app/views/imports/_export_links.html.haml
 - app/views/imports/donations/_approved.html.haml
 - app/views/imports/donations/_caching.html.haml
 - app/views/imports/donations/_failed.html.haml
@@ -2348,6 +2357,7 @@ files:
 - app/views/orders/_search_form.haml
 - app/views/orders/index.html.haml
 - app/views/orders/membership.html.haml
+- app/views/orders/passes.html.haml
 - app/views/orders/sales.html.haml
 - app/views/orders/show.html.haml
 - app/views/organizations/_connection_form.html.haml
@@ -2394,6 +2404,7 @@ files:
 - app/views/producer_mailer/ticket_offer_rejected.text.erb
 - app/views/refunds/_grouped_form.html.haml
 - app/views/refunds/new.html.haml
+- app/views/regular_donation_kits/edit.html.haml
 - app/views/relationships/index.html.haml
 - app/views/reports_mailer/_fine_print.html.haml
 - app/views/reports_mailer/daily.html.haml
@@ -2466,6 +2477,7 @@ files:
 - app/views/store/passes/index.html.haml
 - app/views/store/retrievals/index.html.haml
 - app/views/store/shared/_donate_form.html.haml
+- app/views/store/shared/_small_donate_form.html.haml
 - app/views/store/shows/_show.html.haml
 - app/views/store/shows/show.html.haml
 - app/views/ticket_types/edit.html.haml
@@ -2648,6 +2660,7 @@ files:
 - db/migrate/20140521195853_add_deleted_at_to_pass_type.rb
 - db/migrate/20140522205554_add_limit_to_events_pass_types.rb
 - db/migrate/20140523180444_remove_tickets_purchased_from_passes.rb
+- db/migrate/20140603200735_add_subtitle_to_events.rb
 - db/migrate/20140619194127_add_do_not_call_to_people.artfully_ose_engine.rb
 - db/migrate/20140623160543_add_index_to_items.rb
 - lib/artfully_ose.rb
@@ -2689,8 +2702,7 @@ files:
 - spec/factories/ticket_type_factories.rb
 - spec/factories/user_factories.rb
 homepage: http://fracturedatlas.github.com/artfully_ose/
-licenses:
-- GNU AFFERO GENERAL PUBLIC LICENSE
+licenses: []
 metadata: {}
 post_install_message: 
 rdoc_options: []
@@ -2703,9 +2715,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>'
+  - - ! '>='
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      version: '0'
 requirements: []
 rubyforge_project: 
 rubygems_version: 2.2.2