artfully_ose 1.3.0.pre3 → 1.3.0.pre4

data/app/views/exchanges/_assigned_chart.html.haml

@@ -0,0 +1,108 @@
+
+.row-fluid
+  .span9
+    .center
+      %h3{:style => "line-height: 24px"}
+        ="4. Pick #{@items.length} Seats From the Chart"
+    #big-seat-chart-container
+      .no-image#stage
+        #text
+          STAGE
+
+      #chart-parent{:style => "position: relative; overflow: auto;"}
+        #chart.seat-chart-layout
+          -@chart.by_rows.each do |row_index, row|
+            .seat-row
+              .row-label=row.first.row_label
+              -row.each do |seat|
+                .seat{"data-col-index" => seat.col_index, "data-chart-id" => @chart.id, "data-seat-id" => seat.id, "data-seat-label" => seat.label, "data-seat-note" => seat.seat_note, "data-seat-qualifier" => seat.qualifier, :class => exchange_html_class_for(seat, @ticket_type)}
+                  ="A" if seat.aisle?
+                  -if seat.seat_note.present?
+                    .seat-note
+                      %i.icon-file{:class => "artfully-tooltip", :rel => "tooltip", :title=>"#{seat.seat_note}", "data-placement" => "bottom"}
+              .clear
+
+        #chart-note-display{:style => "#{'display:none' if @chart.public_note.blank?}"}
+          #public-chart-note.bottom-room
+            =@chart.public_note
+
+
+  .span3
+    %h3
+      5. Click This Button
+    .center
+      =link_to "Review Exchange", "#reviewExchangeModal", :class => "btn block btn-success btn-large", :id => "review-exchange-button", :disabled => "disabled", "data-toggle"=>"modal"
+
+#reviewExchangeModal.modal
+  .modal-header
+    .close{'data-dismiss'=>'modal'} x
+    %h3 Confirm Exchange
+  .modal-body
+    = form_tag '/exchanges', :id => "exchange-form" do
+      = hidden_field_tag :order_id, params[:order_id]
+      = hidden_field_tag :show_id, params[:show_id]
+      = hidden_field_tag :ticket_type_id, params[:ticket_type_id]
+      - params[:items].each do |item_id|
+        = hidden_field_tag "items[]", item_id
+      #exchange-details
+        %p
+          When you click the "Confirm Exchange" button, these tickets:
+
+        .center
+          %ul
+            - @items.each do |item|
+              %li.ticket-detail
+                %b= item.show.event.name
+                = "#{l(item.show.datetime_local_to_event, :format => :short)},"
+                = "#{item.product.ticket_type.name},"
+                =number_as_cents item.total_price
+
+        %p
+          will be immediately exchanged for the tickets you selected. We'll update the show data and door list right away.
+
+        %p
+          Artful.ly will not refund or credit any accounts. If there is money to be collected from or refunded to a patron, please reconcile with the patron directly.
+
+
+        - if @order.skip_confirmation_email?
+          %p="We cannot send an email confirmation because we have no email address for #{@order.person}."
+        - else
+          .center
+            .control-group
+              .controls
+                %label.checkbox
+                  = check_box_tag :send_email_confirmation, "1", "", :style => "float:none"
+                  ="Also send an email confirmation to #{@order.person.email}."
+        
+        - unless @ticket_type.nil?
+          .center
+            = submit_tag "Confirm Exchange", :class => "btn btn-large btn-primary", :id => "comfirm-exchange-button", :disable_with => "Exchanging..."
+
+-content_for :custom_js do
+  = javascript_include_tag 'seat-chart'
+  = javascript_include_tag 'exchange-seat-chart'
+
+  :javascript
+    $(document).ready(function() {
+      $(".seat-selectable").click(function () {
+        var numSelectedSeats = $(".seat-selected").length
+        if (numSelectedSeats == #{@items.length}) {
+          $("#review-exchange-button").attr("disabled", false)
+          $("#comfirm-exchange-button").attr("disabled", false)
+        } else {
+          $("#review-exchange-button").attr("disabled", true)
+          $("#comfirm-exchange-button").attr("disabled", true)
+        }
+      })
+
+      $("#exchange-form").submit( function(eventObj) {
+        $.each($(".seat-selected"), function(index, el) {
+          var seatId = $(el).attr("data-seat-id")
+          $('<input />').attr('type', 'hidden')
+              .attr('name', "seat_id[]")
+              .attr('value', seatId)
+              .appendTo('#exchange-form');
+        })
+        return true;
+      });
+    })

data/app/views/exchanges/_general_admission_chart.html.haml

@@ -0,0 +1,55 @@
+= form_tag '/exchanges' do
+  = hidden_field_tag :order_id, params[:order_id]
+  = hidden_field_tag :show_id, params[:show_id]
+  = hidden_field_tag :ticket_type_id, params[:ticket_type_id]
+  - params[:items].each do |item_id|
+    = hidden_field_tag "items[]", item_id
+  #exchange-details
+    - unless @num_available_tickets < @items.length
+      .row
+        .span3.offset2#outgoing-tickets
+          .well
+            %ol.unstyled
+              - @items.each do |item|
+                %li.ticket-detail
+                  %h6= item.show.event.name
+                  = l(item.show.datetime_local_to_event, :format => :short)
+                  %br
+                  = item.product.ticket_type.name
+                  .lead=number_as_cents item.total_price
+        #exchange-arrow.span2
+          %i.fa.fa-arrow-right.fa-3x
+
+        .span3#incoming-tickets
+          .well{class: ("negative" if @free_upgrade)}
+            %ol.unstyled
+              - @items.count.times do
+                %li.ticket-detail
+                  %h6= @event.name
+                  = l(@ticket_type.show.datetime_local_to_event, :format => :short)
+                  %br
+                  = @ticket_type.name
+                  .lead=number_as_cents @ticket_type.price
+
+      .row
+        .span6.offset3
+          %p
+            When you click the "Confirm Exchange" button, The tickets on the left will be immediately exchanged for the tickets on the right. We'll update the show data and door list right away.
+
+          %p
+            Artful.ly will not refund or credit any accounts. If there is money to be collected from or refunded to a patron, please reconcile with the patron directly.
+
+
+          - if @order.skip_confirmation_email?
+            %p="We cannot send an email confirmation because we have no email address for #{@order.person}."
+          - else
+            .center
+              .control-group
+                .controls
+                  %label.checkbox
+                    = check_box_tag :send_email_confirmation, "1", "", :style => "float:none"
+                    ="Also send an email confirmation to #{@order.person.email}."
+          
+          - unless @ticket_type.nil?
+            .center
+              = submit_tag "Confirm Exchange", :class => "btn btn-large btn-primary", :disable_with => "Exchanging..."

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

@@ -21,61 +21,7 @@
       = select_tag "ticket_type_selector", options_for_select(@show.chart.ticket_types.collect{ |ticket_type| [(truncate(ticket_type.name, :length => 20, :separator => ' ', :omission => '...') + ' ' + number_as_cents(ticket_type.price)), url_for(params.merge({:ticket_type_id => ticket_type.id}))] }, url_for(params.merge({:ticket_type_id => @ticket_type.try(:id)}))), include_blank: true, class: "visit-on-select ticket-type-select span4"
 
 - unless @ticket_type.nil?
-  = form_tag '/exchanges' do
-    = hidden_field_tag :order_id, params[:order_id]
-    = hidden_field_tag :show_id, params[:show_id]
-    = hidden_field_tag :ticket_type_id, params[:ticket_type_id]
-    - params[:items].each do |item_id|
-      = hidden_field_tag "items[]", item_id
-    #exchange-details
-      - unless @num_available_tickets < @items.length
-        .row
-          .span3.offset2#outgoing-tickets
-            .well
-              %ol.unstyled
-                - @items.each do |item|
-                  %li.ticket-detail
-                    %h6= item.show.event.name
-                    = l(item.show.datetime_local_to_event, :format => :short)
-                    %br
-                    = item.product.ticket_type.name
-                    .lead=number_as_cents item.total_price
-          #exchange-arrow.span2
-            %i.fa.fa-arrow-right.fa-3x
-
-          .span3#incoming-tickets
-            .well{class: ("negative" if @free_upgrade)}
-              %ol.unstyled
-                - @items.count.times do
-                  %li.ticket-detail
-                    %h6= @event.name
-                    = l(@ticket_type.show.datetime_local_to_event, :format => :short)
-                    %br
-                    = @ticket_type.name
-                    .lead=number_as_cents @ticket_type.price
-
-        .row
-          .span6.offset3
-            %p
-              When you click the "Confirm Exchange" button, The tickets on the left will be immediately exchanged for the tickets on the right. We'll update the show data and door list right away.
-
-            %p
-              Artful.ly will not refund or credit any accounts. If there is money to be collected from or refunded to a patron, please reconcile with the patron directly.
-
-
-            - if @order.skip_confirmation_email?
-              %p="We cannot send an email confirmation because we have no email address for #{@order.person}."
-            - else
-              .center
-                .control-group
-                  .controls
-                    %label.checkbox
-                      = check_box_tag :send_email_confirmation, "1", "", :style => "float:none"
-                      ="Also send an email confirmation to #{@order.person.email}."
-            
-            - unless @ticket_type.nil?
-              .center
-                = submit_tag "Confirm Exchange", :class => "btn btn-large btn-primary", :disable_with => "Exchanging..."
+  =render :partial => "#{@show.chart.class.name.underscore}"
 
 - content_for :custom_js do
   :javascript

data/app/views/general_admission_charts/_show.html.haml

@@ -0,0 +1,2 @@
+#sections
+  = render :partial => 'sections_table', :locals => { :show => @show, :tickets => @show.tickets }

data/app/views/layouts/_menu.html.haml

@@ -1,35 +1,47 @@
-.navbar.navbar-fixed-top
+.navbar
   .navbar-inner
     .container
-      .brand Artful.ly
+      .brand=current_user.current_organization.name
       %ul.nav
         %li{ :class => "dropdown #{active?(:events)}" }
           = nav_dropdown "Sell"
           %ul.dropdown-menu
-            %li= link_to "New Event", new_event_path
-            %li= link_to "All Events", events_path
-            %li= link_to "Memberships", membership_types_path
-            %li= link_to "Passes", pass_types_path
-            %li= link_to "Sales Console", new_console_sale_path
-            -if current_user.is_in_organization? 
-              %li= link_to "Central Storefront", store_organization_events_url(current_user.current_organization.cached_slug), :target => '_blank'
+            %li= permission_link_to [:create, Event], "New Event", new_event_path
+            %li= permission_link_to [:view, Event], "All Events", events_path
+            %li=permission_link_to [:view, Membership], "Memberships", membership_types_path
+            %li=permission_link_to [:view, Pass], "Passes", pass_types_path
+            %li=permission_link_to [:create, Sale], "Sales Console", new_console_sale_path
+            -if current_user.is_in_organization?
+              %li=permission_link_to [:view, Event], "Central Storefront", store_organization_events_url(current_user.current_organization.cached_slug), :target => '_blank'
 
         %li{ :class => "dropdown #{active?(:people)}" }
           = nav_dropdown "People"
           %ul.dropdown-menu
-            %li= link_to "New Contact", new_person_path
-            %li= link_to "Search", people_path
-            %li= link_to "Advanced Search", new_advanced_search_path
-            %li= link_to "List Segments", advanced_search_segments_path
-            %li= link_to "Import", new_import_path(:type => :people)
-            %li= link_to "Export", imports_path
+            %li= permission_link_to [:view_basic, Person], "New Contact", new_person_path
+            %li= permission_link_to [:view_basic, Person], "Search", people_path
+            %li= permission_link_to [:create, Search], "Advanced Search", new_advanced_search_path
+            %li= permission_link_to [:manage, Segment], "List Segments", advanced_search_segments_path
+            %li= permission_link_to [:manage, Person], "Suggested Households", suggested_households_path
+            %li= permission_link_to [:manage, Person], "Tags List", tags_path
+            %li= permission_link_to [:manage, Import], "Import", new_import_path(:type => :people)
+            %li= permission_link_to [:manage, :export], "Export", imports_path
 
-        %li{ :class => "dropdown #{active?(:reports)}" }
-          = nav_dropdown "Reports"
-          %ul.dropdown-menu
-            %li= link_to "Statements", statements_path
-            %li= link_to "Discounts", discounts_reports_path
-            %li= link_to "Imports / Exports", imports_path
+        - if current_user.can? :manage, :report
+          %li{ :class => "dropdown #{active?(:reports)}" }
+            = nav_dropdown "Reports"
+            %ul.dropdown-menu
+              %li= link_to "Statements", statements_path
+              %li= link_to "Discounts", discounts_reports_path
+              %li= link_to "Pass Usage", passes_reports_path
+              %li= link_to "Imports / Exports", imports_path
+
+        %li{ :class => "dropdown #{active?(:campaigns)}" }
+          = nav_dropdown "Fundraising"
+          %ul.dropdown-menu#campaigns-menu
+            %li= link_to "Campaigns", campaigns_path
+            %li= link_to "Log Donation/Pledge", new_contribution_path
+            %li= link_to "Outstanding Pledges", pledges_path
+            %li= link_to "Unacknowledged Gifts", unacknowledged_gifts_path
 
         %li{ :class => "dropdown #{active?(:transactions)}"}
           = nav_dropdown "Orders"
@@ -38,13 +50,14 @@
             %li= link_to "Donations", contributions_path
             %li= link_to "Memberships", membership_orders_path
             %li= link_to "Search All", orders_path
-
-        %li.divider-vertical
-        %li.dropdown
-          = gravatar_image_tag(current_user.email, :alt => 'User icon', :class => 'nav-grav', :gravatar => { :size => 32 })
-        %li.dropdown
-          = nav_dropdown current_user.email
-          %ul.dropdown-menu
-            -if current_user.is_in_organization?
-              %li= link_to "Account Administration", organization_path(current_user.current_organization)
-            %li= link_to "Sign Out", destroy_user_session_path
+        
+        %ul.nav.pull-right
+          %li.divider-vertical
+          %li.dropdown
+            = gravatar_image_tag(current_user.email, :alt => 'User icon', :class => 'nav-grav', :gravatar => { :size => 32 })
+          %li.dropdown
+            = nav_dropdown current_user.email
+            %ul.dropdown-menu
+              -if current_user.is_in_organization?
+                %li= link_to "Account Administration", organization_path(current_user.current_organization)
+              %li= link_to "Sign Out", destroy_user_session_path

data/app/views/layouts/storefront.html.haml

@@ -2,40 +2,49 @@
 %html{:xmlns => "http://www.w3.org/1999/xhtml", "xml:lang" => "en", :lang => "en"}
   %head
     %title= "#{yield :title}"
+    :plain
+      <link href='http://fonts.googleapis.com/css?family=Gravitas+One' rel='stylesheet' type='text/css'>
+      <link href='http://fonts.googleapis.com/css?family=Roboto' rel='stylesheet' type='text/css'>
+      <link href='http://fonts.googleapis.com/css?family=Old+Standard+TT' rel='stylesheet' type='text/css'>
+      <link href='http://fonts.googleapis.com/css?family=PT+Sans+Narrow' rel='stylesheet' type='text/css'>
     = stylesheet_link_tag :storefront
     = render :partial => 'layouts/google_analytics', :locals => { :segment => "storefront" }
   %body
     .navbar.navbar-fixed-top
-      .navbar-inner
-        .container
-          = link_to @store_organization.name, store_organization_events_url(@store_organization.cached_slug), :class => 'brand'
-          %ul.nav#main-menu-options
-            %li= link_to "Buy Tickets", store_events_path(@store_organization.cached_slug)
-            - if @store_organization.has_active_passes_storefront?
-              %li= link_to "Buy Passes", store_passes_path(@store_organization.cached_slug)
-            - if @store_organization.has_active_membership_storefront?
-              -if member_signed_in?
-                %li= link_to "Buy Memberships", store_memberships_path(@store_organization.cached_slug)
-              -else
-                %li= link_to "Become a Member", store_memberships_path(@store_organization.cached_slug)
-            - if @store_organization.has_active_donation_only_storefront?
-              -if @store_organization.kit(:regular_donation).donate_now_text.present?
-                %li= link_to @store_organization.kit(:regular_donation).donate_now_text, store_donate_path(@store_organization.cached_slug), :class => "btn btn-small btn-warning primary"
-              -else
-                %li= link_to "Donate Now", store_donate_path(@store_organization.cached_slug), :class => "btn btn-small btn-warning primary"
-          - if @store_organization.has_kit?(:membership)
-            %ul.nav.pull-right#menu-member-login
-              -if member_signed_in?
-                %li.dropdown
-                  = nav_dropdown member_menu_caption
-                  %ul.dropdown-menu
-                    %li= link_to "My Membership", members_root_path
-                    %li= link_to "Sign Out", destroy_member_session_path
-              -else
-                %li= link_to "Member Login", new_member_session_path({ :org_name => @store_organization.name })
-          %ul.nav.pull-right
-            %li
-              =icon_link_to("#{current_cart.items.size}", store_order_path(@store_organization.cached_slug), 'fa-shopping-cart', '', 'cart-item-count')
+      .clean
+        .navbar-inner
+          .container
+            = link_to @store_organization.name, store_organization_events_url(@store_organization.cached_slug), :class => 'brand brand-lite'
+            %ul.nav#main-menu-options
+              %li= link_to "Buy Tickets", store_events_path(@store_organization.cached_slug)
+              - if @store_organization.has_kit?(:passes)
+                %li= link_to "Buy Passes", store_passes_path(@store_organization.cached_slug)
+              
+              - if @store_organization.has_kit?(:membership)
+                -if member_signed_in?
+                  %li= link_to "Buy Memberships", store_memberships_path(@store_organization.cached_slug)
+                -else
+                  %li= link_to "Become a Member", store_memberships_path(@store_organization.cached_slug)
+              
+              - if @store_organization.has_active_donation_only_storefront?
+                -if @store_organization.kit(:regular_donation).donate_now_text.present?
+                  %li= link_to @store_organization.kit(:regular_donation).donate_now_text, store_donate_path(@store_organization.cached_slug), :class => "btn btn-small btn-warning primary"
+                -else
+                  %li= link_to "Donate Now", store_donate_path(@store_organization.cached_slug), :class => "btn btn-small btn-warning primary"
+            
+            - if @store_organization.has_kit?(:membership)
+              %ul.nav.pull-right#menu-member-login
+                -if member_signed_in?
+                  %li.dropdown
+                    = nav_dropdown member_menu_caption
+                    %ul.dropdown-menu
+                      %li= link_to "My Membership", members_root_path
+                      %li= link_to "Sign Out", destroy_member_session_path
+                -else
+                  %li= link_to "Member Login", new_member_session_path({ :org_name => @store_organization.name })
+            %ul.nav.pull-right
+              %li
+                =icon_link_to("#{current_cart.items.size}", store_order_path(@store_organization.cached_slug), 'fa-shopping-cart', '', 'cart-item-count')
 
     .content.container
       = render :partial => 'layouts/flash', :locals => { :flash => flash }
@@ -43,5 +52,38 @@
       = javascript_include_tag 'ical'
       = yield
 
+      -if write_membership_modal
+        .modal.fade.hide{:id => "loginNagModal"}
+          .modal-header
+            .close{'data-dismiss'=>'modal'} x
+            .center
+              %h4 LET'S FIND YOUR TICKETS
+          .modal-body
+            .row-fluid
+              .span6
+                .well
+                  .center
+                    %h6 LOG INTO YOUR ACCOUNT
+                  
+                  = form_for(Member.new, :as => "member", :url => session_path("member")) do |f|
+                    %fieldset
+                      = f.text_field :email, :placeholder => "Email"
+                      = f.password_field :password, :placeholder => "Password", :autocomplete => 'off'
+                      = f.submit "Sign In", :class => "btn btn-primary btn-block"
+              .span6
+                .well
+                  .center
+                    %h6 NEW HERE?
+                  .button-container
+                    =link_to "Become a member", store_memberships_path(@store_organization), :class => "btn btn-block btn-success"
+                    %button.btn.btn-block#close-login-nag
+                      Continue without signing in
+
+            .row-fluid
+              %p
+                Forgot your password? 
+                =link_to "Click here so we can help", new_password_path("member")
+
     = javascript_include_tag "https://ajax.googleapis.com/ajax/libs/jquery/1.7.1/jquery.min.js"
     = javascript_include_tag :storefront
+    = yield :custom_js

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

@@ -5,6 +5,7 @@
       =form.hidden_field :person_id
       =form.hidden_field :search_id
       =form.hidden_field :segment_id
+      =form.hidden_field :advanced_search_id
     
       .control-group
         = form.label "Membership Type", :class => 'control-label'