artfully_ose 1.2.0.pre.27 → 1.2.0

data/app/assets/stylesheets/sass/store.sass

@@ -123,8 +123,6 @@ h4
 img#logo
   float: left
   margin-right: 10px
-
-h1#logo
   
 ul#shows, ul#memberships
   clear: both
@@ -230,56 +228,6 @@ table.calendar
 #shopping-cart
   width: auto
   background-color: #e6e6e6 !important
-  #steps
-    display: none
-    position: static
-    background: #fff
-    position: static
-    width: 650px
-    margin: 0px auto
-    padding: 50px
-    padding-top: 10px
-    padding-bottom: 0
-    height: 380px
-    overflow: auto
-    ul#nav
-      width: 650px
-      margin: 0 auto
-      overflow: hidden
-      margin-bottom: 20px
-      li
-        float: left
-        list-style: none
-        letter-spacing: 0
-        font-family: "Helvetica", Arial, arial, sans-serif
-        word-spacing: normal
-        &.active a
-          background-color: $compliment_highlight
-          color: #fff
-          font-weight: normal
-        &.disabled a
-          color: #BBB
-          cursor: default
-        a
-          @include rounded-corners(15px, 15px, 15px, 15px)
-          font-size: 12px
-          padding-top: 8px
-          padding-bottom: 8px
-          margin-top: 4px
-          padding-right: 12px
-          padding-left: 12px
-          margin-right: 2px
-          line-height: 14px
-          display: block
-          color: #333
-          &:hover
-            text-decoration: none
-  lable.error
-    color: red
-  .tab-pane
-    display: none
-    &.active
-      display: block
 
   #cart
     width: 100%
@@ -412,15 +360,7 @@ table.calendar
   text-shadow: none
   color: #fff
   background-color: #a85300
-  background-image: -khtml-gradient(linear, left top, left bottom, from(#f8930a), to(#a85300))
-  background-image: -moz-linear-gradient(top, #f8930a, #a85300)
-  background-image: -ms-linear-gradient(top, #f8930a, #a85300)
-  background-image: -webkit-gradient(linear, left top, left bottom, color-stop(0%, #f8930a), color-stop(100%, #a85300))
-  background-image: -webkit-linear-gradient(top, #f8930a, #a85300)
-  background-image: -o-linear-gradient(top, #f8930a, #a85300)
-  background-image: linear-gradient(top, #f8930a, #a85300)
-  filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#f8930a', endColorstr='#a85300', GradientType=0)
-  border-color: #a85300 #a85300 #003f81
+  background-image: none
 
 .navbar .btn.primary 
   margin-top: 3px
@@ -502,7 +442,7 @@ tr.no-border
     padding: 3px
     border: 1px solid #eee
 
-#event-header
+#event-header, #donate-now-header
   h1
     font-family: 'Roboto', sans-serif
     font-weight: 300
@@ -511,6 +451,19 @@ tr.no-border
     font-weight: 100
     margin: 0px 0px 2px 0px
 
+#donate-now-header
+  text-align: center
+  margin-bottom: 30px
+
+#donate-now-container
+  margin-top: -30px
+  padding: 50px 20px 60px 20px
+  box-shadow: 6px 5px 5px -5px #999, -6px 5px 5px -5px #999
+
+#donate-now
+  text-align: center
+  margin-top: 20px
+
 .available-ticket-type-table
   form
     margin: 0px
@@ -538,3 +491,40 @@ tr.no-border
 #poster-modal
   .modal-body
     text-align: center
+
+.add-donation-to-cart
+  .preset-amount
+    float: left
+    width: 227px
+    // height: 28px
+    margin-bottom: 10px
+    text-align: left
+
+.add-donation-to-cart
+  .preset-amount.last
+    width: 455px
+
+.add-donation-to-cart
+  .preset-amount
+    label
+      margin: 0
+      padding: 0
+      // height: 28px
+      line-height: 28px
+
+.add-donation-to-cart
+  .preset-amount
+    label
+      input[type='radio']
+        float: none
+        vertical-align: baseline
+        margin-top: 0
+
+#event-header.side-section
+  h4
+    padding-bottom: 8px
+  #subtitle
+    padding-bottom: 8px
+    font-weight: bold
+    line-height: 1.4em
+    font-size: 1em

data/app/assets/stylesheets/storefront.css

@@ -1,4 +1,4 @@
- /*
+/*
  *= require bootstrap
  *= require sass/cart
  *= require sass/store

data/app/concerns/itemable.rb

@@ -1,6 +1,6 @@
 #
 # Include this method on objects that can be used to create items using Item.for
-# Ticket class doesn't meed it because it defines its own sold_price method
+# Ticket class doesn't need it because it defines its own sold_price method
 #
 module Itemable
   extend ActiveSupport::Concern

data/app/concerns/pdf_generation.rb

@@ -17,17 +17,7 @@ class PdfGeneration
   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)
+    Wisepdf::Writer.new.to_pdf(content)
   end
 
   def content

data/app/concerns/search_by_dates.rb

@@ -0,0 +1,20 @@
+module SearchByDates
+  attr_reader :start, :stop
+  attr_reader :organization
+
+  def start_with(start)
+    start.present? ? DateTime.parse(start) : default_start
+  end
+
+  def stop_with(stop)
+    stop.present? ? Sundial.midnightish(@organization, stop) : default_stop
+  end
+
+  def default_start
+    DateTime.now.in_time_zone(@organization.time_zone).beginning_of_month
+  end
+
+  def default_stop
+    DateTime.now.in_time_zone(@organization.time_zone).end_of_day
+  end
+end

data/app/controllers/events_controller.rb

@@ -95,6 +95,7 @@ class EventsController < ArtfullyOseController
   end
 
   def widget
+    @donation_kit = current_user.current_organization.kit(:regular_donation)
   end
 
   def storefront_link

data/app/controllers/export_controller.rb

@@ -7,6 +7,9 @@ class ExportController < ArtfullyOseController
     send_data @csv_string, :filename => @filename, :type => "text/csv", :disposition => "attachment"
   end
 
+  #
+  # Artful.ly generates these nightly and provides links directly to s3
+  #
   def donations
     @organization = current_user.current_organization
     @filename = "Artfully-Donations-Export-#{DateTime.now.strftime("%m-%d-%y")}.csv"
@@ -15,8 +18,15 @@ class ExportController < ArtfullyOseController
     send_data @csv_string, :filename => @filename, :type => "text/csv", :disposition => "attachment"
   end
 
+  #
+  # Artful.ly generates these nightly and provides links directly to s3
+  #
   def ticket_sales
-    # Moved to s3. Generated nightly with rake csv:sales
+    @organization = current_user.current_organization
+    @filename = "Artfully-Ticket-Sales-Export-#{DateTime.now.strftime("%m-%d-%y")}.csv"
+    @items = ItemView.where(:organization_id => current_organization).where(:product_type => "Ticket").all
+    @csv_string = @items.to_comma(:ticket_sale)    
+    send_data @csv_string, :filename => @filename, :type => "text/csv", :disposition => "attachment"
   end
 
 end

data/app/controllers/imports_controller.rb

@@ -23,9 +23,8 @@ class ImportsController < ArtfullyOseController
     # Building an import preview was just murdering us. The problem is way down in Array.index in parsed_row.load_value.
     # Temporarily shutting it off for > 1000
     #
-    @under_limit = @import.import_rows.count < 1000
-    if @import.status == "pending" && @under_limit
-      @parsed_rows = @import.parsed_rows.paginate(:page => params[:page], :per_page => 50)
+    if @import.status == "pending"
+      @imported_rows    = @import.import_rows.paginate(:page => params[:page], :per_page => 50)
     end
 
     @people   = Person.where(:import_id => @import.id).paginate(:page => params[:page], :per_page => 50) unless @import.id.nil?

data/app/controllers/member_cards_controller.rb

@@ -4,9 +4,8 @@ class MemberCardsController < ArtfullyOseController
   before_filter :find_members
 
   def new
-    generator = MemberCardGenerator::BlanksUsaIdc6.new(@members)
-    generator.generate
-    redirect_to generator.download_url
+    pdf = MemberCardGenerator::BlanksUsaIdc6.new(@members).generate
+    send_data pdf, :filename => "member_cards.pdf", :type => "application/pdf", :disposition => "attachment"
   end
 
   private

data/app/controllers/orders_controller.rb

@@ -89,6 +89,48 @@ class OrdersController < ArtfullyOseController
     end
   end
 
+  def passes
+    authorize! :view, Order
+
+    @organization = current_organization
+    @pass_type  = PassType.find_by_id(params[:pass_type_id]) if params[:pass_type_id].present?
+    @pass_types = @organization.pass_types
+
+    request.format = :csv if params[:commit] == "Download"
+
+    search_terms = {
+      :start        => params[:start],
+      :stop         => params[:stop],
+      :organization => @organization,
+      :pass_type    => @pass_type
+    }
+
+    @search = PassSaleSearch.new(search_terms) do |results|
+      results.paginate(:page => params[:page], :per_page => 25)
+    end
+
+    respond_to do |format|
+      format.html
+      format.csv do
+        filename = "Artfully-Pass-Sales-Export-#{DateTime.now.strftime("%m-%d-%y")}.csv"
+        items = ItemView.where(:product_type => "Pass")
+                             .where('items_view.created_at > ? ', @search.start)
+                             .where('items_view.created_at < ?',  @search.stop)
+                             .where('items_view.organization_id = ?', current_organization)
+                             .order('items_view.created_at desc')
+        if @pass_type
+          items = items.joins(:item).
+            joins("INNER JOIN passes ON (items.product_type = #{::Item.sanitize('Pass')} AND items.product_id = passes.id)").
+            joins("INNER JOIN pass_types ON (pass_types.id = passes.pass_type_id)").
+            where(:pass_types => {:id => @pass_type}).
+            group('items_view.order_id')
+        end
+        csv_string = items.all.to_comma(:pass_sale)
+        send_data csv_string, :filename => filename, :type => "text/csv", :disposition => "attachment"
+      end
+    end
+  end
+
   def sales
     authorize! :view, Order
 

data/app/controllers/organizations_controller.rb

@@ -40,6 +40,7 @@ class OrganizationsController < ArtfullyOseController
 
     if @organization.save
       @organization.users << current_user
+      @organization.make_owner(current_user)
       redirect_to organizations_url, :notice => "#{@organization.name} has been created"
     else
       render :new

data/app/controllers/passes_reports_controller.rb

@@ -1,5 +1,25 @@
 class PassesReportsController < ArtfullyOseController
   def index
-    @pass_types = current_organization.pass_types.all
+    @start_date = params[:start_date]
+    @end_date = params[:end_date]
+    @organization = current_user.current_organization
+    @pass_types = @organization.pass_types
+    @pass_type = PassType.find(params[:pass_type]) if params[:pass_type].present?
+    @report = nil
+    @report = PassesReport.new(@organization, @pass_type, @start_date, @end_date)
+    @rows = @report.rows.paginate(:page => params[:page], :per_page => 100) unless @report.nil?
+
+    @options_for_select = @pass_types.collect{ |p| [p.name, p.id] }
+    @options_for_select.unshift [PassType::ALL_PASSES_STRING, nil]
+
+    respond_to do |format|
+      format.html
+
+      format.csv do
+        @filename = [ @report.header, ".csv" ].join
+        @csv_string = @report.rows.to_comma
+        send_data @csv_string, :filename => @filename, :type => "text/csv", :disposition => "attachment"
+      end
+    end
   end
 end

data/app/controllers/regular_donation_kits_controller.rb

@@ -0,0 +1,32 @@
+class RegularDonationKitsController < ApplicationController
+  rescue_from CanCan::AccessDenied do |exception|
+    flash[:alert] = exception.message
+    redirect_to root_path, :alert => exception.message
+  end
+
+  before_filter do
+    authorize! :edit, current_user.current_organization
+  end
+
+  def edit
+    @kit = Kit.find(params[:id])
+  end
+
+  def update
+    @kit = Kit.find(params[:id])
+
+    if @kit.update_attributes(kit_params)
+      flash[:notice] = 'Your changes have been saved.'
+      redirect_to organization_path(@kit.organization)
+    else
+      flash[:error] = 'We had a problem configuring your kit. Please try again.'
+      render :edit
+    end
+  end
+
+  private
+
+  def kit_params
+    params[:regular_donation_kit]
+  end
+end

data/app/controllers/store/donations_controller.rb

@@ -1,4 +1,22 @@
 class Store::DonationsController < Store::StoreController
+  rescue_from ActiveRecord::RecordNotFound do
+    render :text          => File.read("#{Rails.root}/public/404.html"),
+           :content_type  => Mime::HTML,
+           :status        => :not_found
+  end
+
   def index
+    # If there is no kit at all, NotFound
+    raise ActionController::RoutingError.new('Not Found') unless @store_organization.has_kit?(:regular_donation)
+
+    # If there's a kit, and they're logged in, show them a preview if the kit is off
+    if current_user && current_user.current_organization == @store_organization
+      if !@store_organization.has_active_donation_only_storefront?
+        flash[:notice] = "You are seeing a preview of your donation-only storefront. To make this page visible to the general public, go to your 501(c)(3) kit configuration and check \"Display Donation-Only Storefront\""
+      end
+    else
+      # show everyone else NotFound
+      raise ActionController::RoutingError.new('Not Found') unless @store_organization.has_active_donation_only_storefront?
+    end
   end
-end  
+end

data/app/controllers/store/orders_controller.rb

@@ -1,18 +1,29 @@
 class Store::OrdersController < Store::StoreController
   include ActionView::Helpers::TextHelper
   include ArtfullyOseHelper
-  
+
   def update
     handler = OrderHandler.new(current_cart, current_member)
-    handler.handle_tickets(params)    
+    handler.handle_tickets(params)
     handler.handle_donation(params, @store_organization)
     handler.handle_memberships(params, current_member)
     handler.handle_passes(params)
     handler.handle_discount_or_pass_code(params)
 
-    flash[:alert] = handler.error unless handler.error.blank?
+    if handler.error.present?
+      flash[:alert] = handler.error unless handler.error.blank?
+
+      redirect_url = case params[:_source]
+      when 'storefront'
+        store_donate_path
+      else
+        store_order_path
+      end
 
-    redirect_to store_order_path
+      redirect_to redirect_url
+    else
+      redirect_to store_order_path
+    end
   end
 
   def show
@@ -50,7 +61,6 @@ class Store::OrdersController < Store::StoreController
   end
 
   private
-
     def event
       current_cart.tickets.first.event
     end