artfully_ose 1.2.0.beta.1 → 1.2.0.pre

data/app/views/shows/index.html.haml

@@ -9,100 +9,31 @@
   .span9
     = render "shared/error_messages", :target => @event
     .row-fluid
-      .span12
-        .something
-          .btn-group.pull-right
-            =link_to "Upcoming", event_shows_path(@event), :class => "btn #{"active" if @upcoming}"
-            =link_to "All", event_shows_path(@event, :range => :all), :class => "btn #{"active" if @all}"
-            %a.btn.dropdown-toggle#month-button{"data-toggle"=>"dropdown", :href=>"#", :class => "#{"active" if @monthly}"}
-              =@monthly ? "#{params[:month]} #{params[:year]}" : "Month"
-              %span.caret
-            %ul.dropdown-menu#month-select
-              - @month_years.each do |month_year|
-                %li=link_to month_year, monthly_event_shows_path(@event, month_year.split[1], month_year.split[0])
-
-    %table.table.table-hover
+      .span3
+        %h3 Shows List
+      .span9
+        =icon_link_to("Add", new_event_show_path(@event, @show), 'icon-plus-sign', 'btn', '')
+    %table.table
       %thead
-        %th{:colspan => 2} Date/Time
+        %th Date/Time
         %th
-        %th.right Capacity
-        %th.right Open
-        %th.right On Sale
-        %th.right Off Sale
-        %th.right Sold
-        %th.right Comped
+        %th On sale
+        %th Sold
+        %th Comped
       %tbody
         -if @shows.empty?
           %tr
-            %td{:colspan => 9}
+            %td{:colspan => 5}
               .no-image.full
                 #text
-                  =link_to 'You have no upcoming shows scheduled.', new_event_show_path(@event, @show)
+                  =link_to 'You have no shows scheduled.  Add one now.', new_event_show_path(@event, @show)
         -@shows.each do |show|
-          %tr.sprited-container.valign{:id => "show_row_#{show.id}", :class => "#{'unpublished' if show.unpublished?}"}
-            %td
-              =link_to l(show.parsed_local_datetime, :format => :abbreviated_day), event_show_path(@event, show), :title => 'show-datetime'
-            %td
-              =link_to l(show.parsed_local_datetime, :format => :short), event_show_path(@event, show), :title => 'show-datetime'
+          %tr.sprited-container{ :class => [show.state, show.destroyable? ? "destroyable" : "" ] }
             %td
-              -unless show.played?
-                %ul.in-table
-                  %li.dropdown{:id => "bulkactions#{show.id}"}
-                    =icon_link_to('', "#menu#bulkactions#{show.id}", 'fa-asterisk', 'dropdown-toggle dropdown btn btn-mini', '')
-                    %ul.sprited-element.dropdown-menu{ :class => [show.state] }
-                      %li
-                        =link_to "Door List", new_event_show_sales_path(@event, show, :render => 'doorlist')
-                      %li{:class => "sprited built published"}
-                        =link_to("Unpublish", unpublished_event_show_path(@event, show), {:remote => true, 'data-type' => :json, :method => :post})
-                      %li{:class => "sprited built unpublished"}
-                        =link_to("Publish", published_event_show_path(@event, show), {:remote => true, 'data-type' => :json, :method => :post})
-                      %li
-                        =link_to "Put on sale", "#putOnSale#{show.id}", 'data-toggle' => 'modal'
-                      %li
-                        =link_to "Take off sale", "#takeOffSale#{show.id}", 'data-toggle' => 'modal'
-
-              .modal{:id => "takeOffSale#{show.id}"}
-                .modal-header
-                  .close{'data-dismiss'=>'modal'} x
-                  .row-fluid
-                    .span10
-                      %h3 Take Tickets Off Sale
-                .modal-body
-                  =form_tag off_sale_event_show_path(@event, show), :method => :post, :class=>'form-inline' do
-                    Quantity:
-                    =text_field_tag :quantity, "0", :class => 'span1'
-                    %button.btn{:type=>'submit'}
-                      Take off sale
-
-
-              .modal{:id => "putOnSale#{show.id}"}
-                .modal-header
-                  .close{'data-dismiss'=>'modal'} x
-                  .row-fluid
-                    .span10
-                      %h3 Put Tickets On Sale
-                .modal-body
-                  =form_tag on_sale_event_show_path(@event, show), :method => :post, :class=>'form-inline' do
-                    Quantity:
-                    =text_field_tag :quantity, "0", :class => 'span1'
-                    %button.btn{:type=>'submit'}
-                      Put on sale
-
-
-            %td.right.available_value{:id => "capacity#{show.id}"}= show.capacity
-            %td.right.available_value{:id => "open#{show.id}"}= show.open
-            %td.right.available_value{:id => "on_sale#{show.id}"}= show.on_sale
-            %td.right.available_value{:id => "off_sale#{show.id}"}= show.off_sale
-            %td.right.gross_value{:id => "sold#{show.id}"}= show.sold
-            %td.right.comped_value{:id => "comped#{show.id}"}= show.comped
-
-    .row-fluid
-      .span12
-        #calendar-help
-          .pull-right
-            %span{:style => 'background-color: #ADADAD'} &nbsp&nbsp&nbsp&nbsp
-            Unpublished shows
-            %span{:style => 'background-color: #FFFFFF; border:1px solid #bbb;'} &nbsp&nbsp&nbsp&nbsp
-            Published shows
-
-    =will_paginate @shows
+              =link_to l(show.datetime_local_to_event, :format => :short), event_show_path(@event, show), :title => 'show-datetime'
+            %td{:style => 'text-align:right'}
+              =render :partial => "shows/controls", :locals => { :show => show }
+            %td.available_value= show.glance.available_total
+            %td.gross_value= show.glance.sold_total
+            %td.comped_value= show.glance.comped_total
+                  

data/app/views/shows/new.html.haml

@@ -8,17 +8,18 @@
     =render :partial=>'events/menu'
   .span9
     = render "shared/error_messages", :target => @event
+    %h3 Add a Show
     = form_for @show, :html => { :class => 'form-horizontal' }, :url => event_shows_path(@event, @show) do |show_form|
-      =render :partial => "shared/show_time_and_calendar", :locals => {:event_type => "events"}
+      #new-show-calendar
+    
 
-      .navbar.clean
-        .navbar-inner
-          .brand.brand-lite Capacity & Prices
       = show_form.fields_for :chart, @show.chart do |f|
         = f.fields_for :sections do |builder|
-          = render 'events/section_fields', :f => builder, :new_show => true
-                    
-      .form-actions
-        = show_form.submit "Save", :class => 'btn btn-primary'
-        = show_form.submit "Save & Publish", :class => 'btn btn-success'
-        %span.help{'data-title' => 'Publishing', 'data-content' => "Publishing a show means that your show is displayed on your storefront and all on sale tickets are available for purchase".html_safe} ?
+          = render 'events/section_fields', :f => builder
+                        
+          .form-actions
+            = show_form.submit "Save", :class => 'btn btn-primary'
+            = show_form.submit "Save & Publish", :class => 'btn btn-success'
+            %span.help{'data-title' => 'Publishing', 'data-content' => "Publishing a show means that your show is displayed on your storefront and all on sale tickets are available for purchase".html_safe} ?
+          
+           

data/app/views/shows/show.html.haml

@@ -15,7 +15,7 @@
           .span5
             =render :partial => "work_with", :locals => {:show => @show}
           .span6
-            =icon_link_to("Box Office", new_event_show_sales_path(@event,@show,:render => 'boxoffice'), 'fa-shopping-cart', 'btn', '')
+            =icon_link_to("Box Office", new_event_show_sales_path(@event,@show), 'icon-shopping-cart', 'btn', '')
       .span6
         = render :partial => "glance", :locals => { :report => @show.glance, :show => @show }
     #sections
@@ -23,5 +23,5 @@
         .span3
           %h4 Ticket Capacity
       = render :partial => 'sections_table', :locals => { :show => @show, :tickets => @show.tickets }
-
+      
 #newTicketType.modal

data/app/views/slices/index.html.haml

@@ -13,7 +13,7 @@
 
 
 - content_for :header do
-  %h3="#{@show.event.name} #{l @show.parsed_local_datetime, :format => :short}"
+  %h3="Slices: #{@show.event.name} #{l @show.datetime_local_to_organization, :format => :short}"
 
 .row
   .span12
@@ -36,7 +36,6 @@
         .center.headline-stat#tickets-pct="--"
         .center.headline-caption
           %h6 PCT OF SLICE
-    =icon_link_to("View statement", statement_path(@show), 'fa-share', 'btn', '')
   .span10
     #vis
 

data/app/views/statements/_discounts_table.html.haml

@@ -23,4 +23,4 @@
         %td.right
     %tr
       %td.right{:colspan => 6}
-        = icon_link_to "Slices", statement_slices_path(@show.id, 'slice[]' => 'discount_code_proc'), 'fa-chevron-right', 'btn', ''
+        = icon_link_to "Slices", statement_slices_path(@show.id, 'slice[]' => 'discount_code_proc'), 'icon-chevron-right', 'btn', ''

data/app/views/statements/_order_location_table.html.haml

@@ -17,4 +17,4 @@
         %td.right=number_as_cents row.net
     %tr
       %td.right{:colspan => 5}
-        = icon_link_to "Slices", statement_slices_path(@show.id, 'slice[]' => 'order_location_proc'), 'fa-chevron-right', 'btn', ''
+        = icon_link_to "Slices", statement_slices_path(@show.id, 'slice[]' => 'order_location_proc'), 'icon-chevron-right', 'btn', ''

data/app/views/statements/_payment_method_table.haml

@@ -17,4 +17,4 @@
         %td.right=number_as_cents row.net
     %tr
       %td.right{:colspan => 5}
-        = icon_link_to "Slices", statement_slices_path(@show.id, 'slice[]' => 'payment_method_proc'), 'fa-chevron-right', 'btn', ''
+        = icon_link_to "Slices", statement_slices_path(@show.id, 'slice[]' => 'payment_method_proc'), 'icon-chevron-right', 'btn', ''

data/app/views/statements/_ticket_type_table.haml

@@ -9,10 +9,7 @@
   %tbody
     - statement.ticket_type_rows.each do |ticket_type, row|
       %tr
-        %td
-          =ticket_type.capitalize
-          -if row.member_ticket
-            .badge.badge-success Member
+        %td=ticket_type.capitalize
         %td.right=row.tickets
         %td.right
           %strong=number_as_cents row.gross
@@ -20,4 +17,4 @@
         %td.right=number_as_cents row.net
     %tr
       %td.right{:colspan => 5}
-        = icon_link_to "Slices", statement_slices_path(@show.id, 'slice[]' => 'ticket_type_proc'), 'fa-chevron-right', 'btn', ''
+        = icon_link_to "Slices", statement_slices_path(@show.id, 'slice[]' => 'ticket_type_proc'), 'icon-chevron-right', 'btn', ''

data/app/views/statements/show.html.haml

@@ -19,7 +19,7 @@
             %h3="#{@event.name} #{l @statement.datetime, :format => :short}" 
           .span3
             .pull-right
-              =icon_link_to("View show", event_show_path(@show.event, @show), 'fa-share', 'btn', '')
+              =icon_link_to("View show", event_show_path(@show.event, @show), 'icon-share-alt', 'btn', '')
         = render :partial => 'top_stats', :locals => { :statement => @statement }
         #statement_table
           = render :partial => 'payment_method_table', :locals => { :statement => @statement }
@@ -28,7 +28,4 @@
         #order_location
           = render :partial => 'order_location_table', :locals => { :statement => @statement }
         #discounts_table
-          = render :partial => 'discounts_table', :locals => { :statement => @statement }
-        -with_kit(:passes) do
-          #passes_table
-            = render :partial => 'passes_table', :locals => { :statement => @statement }
+          = render :partial => 'discounts_table', :locals => { :statement => @statement }

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

@@ -2,7 +2,7 @@
   .span8.offset2{:style => "border-left: 1px solid #ededed; border-right: 1px solid #ededed;"}
     .row-fluid
       .span8.offset2
-        .thanks-message="#{thanks_message(@order.person)}"
+        .thanks-message="Thanks, #{@order.person.first_name}!"
         .blow
           .row-fluid
             .span6
@@ -22,19 +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 
+          We've also 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.
-
-        -unless @order.passes.empty?
-          %p{:style => "text-align:center"}
-            =link_to "Use Your Pass Now!", store_organization_events_path(@store_organization.cached_slug), :target=>"_blank", :class => "btn btn-success btn-large"
 
         #shopping-cart-display
           .well
@@ -52,11 +45,10 @@
             -unless @order.memberships.empty?
               %h4 Memberships
               %table.table
-                -@order.memberships.each do |item|
+                -current_cart.memberships.each do |membership|
                   %tr
-                    %td=item.product.membership_type.membershipize
-                    %td.right=number_as_cents item.product.membership_type.price
-              =render :partial => "membership_info", :locals => {:email => @order.person.email, :membership_types => @order.membership_types}
+                    %td=membership.membership_type.membershipize
+                    %td.right=number_as_cents membership.membership_type.price
 
             -unless @order.donations.empty?
               %h4 Donations
@@ -65,22 +57,6 @@
                   %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
-              %table.table
-                -@order.passes.each do |item|
-                  %tr
-                    %td="#{item.product.pass_type.passerize}: #{item.product.pass_code}"
-                    %td.right=number_as_cents item.total_price
 
             %table.table
               -@order.discount_codes.each do |discount|
@@ -89,8 +65,11 @@
                     Discount code
                     %span=discount.code
 
-                  %td.right.amount  
-                  
+                  -# Hiding this, because we display the sold price of the tickets in this view.
+                  -# also displaying the discount amount makes the math wrong
+                  %td.right.amount
+                    -#=number_as_cents @order.total_discount
+
             %table.table
               -unless @order.service_fee == 0
                 %tr
@@ -110,14 +89,13 @@
             %h6=event.name
             %p
               =truncate(event.description, :length => 400, :separator => ' ', :omission => '...')
-            -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
+              %b Physical tickets will not be issued for this event. Please check in at the door with your order number.
+            %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?
@@ -131,4 +109,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,19 +1,2 @@
-- 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'
+%h2="Donate to #{@store_organization.name}"
+=render "store/shared/donate_form"

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

@@ -1,4 +1,7 @@
--@dates_by_month.each do |month, dates|
+- dates = @event.upcoming_public_shows.collect(&:datetime_local_to_event).reject {|d| d < Time.zone.now }.map {|d| d.to_date}
+- dates_by_month = dates.group_by {|d| d.strftime("%B %Y")}
+
+-dates_by_month.each do |month, dates|
   .calendar-month
     %h3
       = month

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

@@ -1,23 +1,16 @@
-- content_for :title do
-  #{@store_organization.name} events, shows, and tickets
-
 .row
   .span8.offset2
     -@events.each do |event|
-      .store-event-display{:id => "store-event-display-#{event.id}"}
+      .store-event-display{:id => "event_#{event.id}"}
         .row-fluid
           .span3
             -if event.image?
               =image_tag(event.image.url, :class => "event-image")
           .span9
-            #event-header
-              %h1=event.name
-              %h4=event.subtitle
+            %h2=event.name
             %p
-              =simple_format event.description
+              =event.description
             %p
-              =event.venue.name
-              %br
               =event.venue.address_as_string
             %p
-              =link_to "Buy Tickets", store_event_path(@store_organization.cached_slug, event), :id => 'buy-tickets', :class => 'btn btn-primary'
+              =link_to "Buy Tickets", store_event_path(@store_organization.cached_slug, event), :id => 'buy-tickets', :class => 'btn btn-primary'

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

@@ -1,13 +1,16 @@
 - content_for :title do
   Buy tickets to #{@event.name}
-.container#multi-show-container
-  #event-header
-    %h1#logo= @event.name
-    %h4= @event.subtitle
-    %h4= @event.producer
+.container
+  %h1#logo= @event.name
+  %p= @event.producer
 
   .row
     .span8  
+      %h6 Buy Tickets
+
+      - @use_calendar = (@event.upcoming_public_shows.length > 5 || params[:calendar] == 'true')
+      
+      =render 'calendar' if @use_calendar
       #loading-container
         #loading
           Hang tight! We're searching for your tickets.
@@ -15,9 +18,10 @@
         #error
           We had a problem finding tickets. Please try again.
       %ul#shows.unstyled
-        - @shows.each do |show|
-          %li{:id => "show_#{show.id}", 'data-show-uuid' => show.uuid, 'data-date' => "#{show.datetime_local_to_event.strftime('%D')}"}
-            =render :partial => 'store/shows/show', :locals => {:show => show, :collapsed => true}
+        - @event.upcoming_public_shows.each do |show|
+          %li{:id => "show_#{show.id}", 'data-show-uuid' => show.uuid, :style => "#{'display:none' if @use_calendar}", 'data-date' => "#{show.datetime_local_to_event.strftime('%D')}"}
+            - unless @use_calendar
+              =render :partial => 'store/shows/show', :locals => {:show => show, :collapsed => !@use_calendar}
 
     .span4
       #description.side-section
@@ -34,8 +38,13 @@
                 =simple_format "#{@event.description} (#{link_to 'less','#', :class => 'toggle'})"
           - else
             =simple_format @event.description
-      .side-section
-        =render :partial => "venue", :locals => { :event => @event }
+      #venue.side-section
+        %h6 Venue
+        =link_to image_tag("https://maps.google.com/maps/api/staticmap?size=140x140&maptype=roadmap&markers=color:red|#{@event.venue.address_as_url_query}&sensor=false&zoom=15"), "https://maps.google.com/maps?q=#{@event.venue.address_as_url_query.html_safe}&z=15"
+        %div
+          %strong=@event.venue.name
+        %div=@event.venue.street_as_string
+        %div=@event.venue.city_state_zip_as_string
       - unless @event.contact_email.blank? && @event.contact_phone.blank?
         #contact.side-section
           %h6 Contact