artfully_ose 1.2.0.pre.24 → 1.2.0.pre.26

data/app/views/events/_day_date_show.html.haml

@@ -12,5 +12,5 @@
       %strong=link_to show.datetime_local_to_event.strftime('%l:%M %P'), event_show_path(@event, show)
       #available="#{show.glance.available_total} tickets available"
       #show-links
-        %p=icon_link_to("Door List", door_list_event_show_path(@event, show), 'fa-list', 'btn', '')
-        %p=icon_link_to("Box Office", new_event_show_sales_path(@event, show), 'fa-shopping-cart', 'btn', '')
+        %p=icon_link_to("Door List", new_event_show_sales_path(@event, show, :render => 'doorlist'), 'fa-list', 'btn', '')
+        %p=icon_link_to("Box Office", new_event_show_sales_path(@event, show, :render => 'boxoffice'), 'fa-shopping-cart', 'btn', '')

data/app/views/events/_ticket_type_fields.html.haml

@@ -57,7 +57,7 @@
           This description will appear on your storefront as well as on patron receipts.
     
     .control-group
-      =f.label :availablity, "Availablity", :class => 'control-label'
+      =f.label :visibility, "Visibility", :class => 'control-label'
       .controls
         - TicketType.channels_for(current_user.current_organization).each do |channel, icon|
           =f.check_box channel

data/app/views/events_pass_types/_form.html.haml

@@ -15,7 +15,7 @@
   .control-group
     = f.label :ticket_types, "Allowed Ticket Types", :class => 'control-label'
     .controls
-      = f.select :ticket_types, options_for_select(@ticket_type_names, @events_pass_type.ticket_types.to_a), {}, {'data-placeholder' => "All Prices", :class => 'input chosen', :multiple => true}
+      = f.select :ticket_types, options_for_select(@ticket_type_names, @events_pass_type.ticket_types.to_a), {}, {'data-placeholder' => "Select a Ticket Type", :class => 'input chosen', :multiple => true}
   .control-group
     = f.label :excluded_shows, "Excluded Shows", :class => 'control-label'
     .controls

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

@@ -33,7 +33,8 @@
               =link_to ept.pass_type.name,  edit_event_events_pass_type_path(@event, ept)
             %td
               -if ept.ticket_types.empty?
-                All Ticket Types
+                %strong
+                  No Ticket Types
               -else
                 - ept.ticket_types.each do |ticket_type|
                   =ticket_type

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

@@ -75,7 +75,7 @@
             
             - unless @ticket_type.nil?
               .center
-                = submit_tag "Confirm Exchange", :class => "btn btn-large btn-primary"
+                = submit_tag "Confirm Exchange", :class => "btn btn-large btn-primary", :disable_with => "Exchanging..."
 
 - content_for :custom_js do
   :javascript

data/app/views/imports/people/_new.html.haml

@@ -92,9 +92,21 @@
       %tr
         %td.field-slim LinkedIn 
         %td The person's web address on LinkedIn
+      %tr
+        %td.field-slim Birth month 
+        %td The person's birth month (April, Apr, or 4)
+      %tr
+        %td.field-slim Birth day 
+        %td The person's birth day
+      %tr
+        %td.field-slim Birth year 
+        %td The person's birth year
       %tr
         %td.field-slim Do Not Email 
         %td Indicate that this person is not to receive email communication from your organization.  Use "true" in this column if the person should not be emailed. This is for your organization's internal use only. The person will still receive purchase and donation receipts from Artful.ly.
+      %tr
+        %td.field-slim Do Not Call 
+        %td Indicate that this person is not to receive phone communication from your organization.  Use "true" in this column if the person should not be called. This is for your organization's internal use only.
       %tr
         %td.field-slim Tags
         %td

data/app/views/kits/_list.html.haml

@@ -5,4 +5,5 @@
     %ul
       %li Paid Ticketing
       %li People
-      %li= link_to "Membership", [:edit, @organization.membership_kit], :id => "configure_#{@organization.membership_kit.type.underscore}"
+      %li= link_to "Membership", [:edit, @organization.membership_kit], :id => "configure_#{@organization.membership_kit.type.underscore}"
+      %li= link_to "Passes", [:edit, @organization.passes_kit], :id => "configure_#{@organization.passes_kit.type.underscore}"

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

@@ -20,15 +20,12 @@
             %li= link_to "List Segments", segments_path
             %li= link_to "Import", new_import_path(:type => :people)
             %li= link_to "Export", imports_path
-            %li= link_to "Suggested Households", suggested_households_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 "Members", "#"
-            %li= link_to "Passes", passes_reports_path
             %li= link_to "Imports / Exports", imports_path
 
         %li{ :class => "dropdown #{active?(:transactions)}"}

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

@@ -13,6 +13,8 @@
         .center
           .bottom-room
             %h3 Where to?
-          .bottom-room=link_to "Member Dashboard", "#", :class => "btn btn-large", :style => "Width: 200px"
+          -if @membership_comp.people.length == 1
+            .bottom-room=link_to "View This Patron", person_path(@membership_comp.people.first), :class => "btn btn-large", :style => "Width: 200px"
           .bottom-room=link_to "Home Dashboard", root_path, :class => "btn btn-large", :style => "Width: 200px"
+          .bottom-room=link_to "People Search", people_path, :class => "btn btn-large", :style => "Width: 200px"
           .bottom-room=link_to "Advanced Search", new_search_path, :class => "btn btn-large", :style => "Width: 200px"

data/app/views/membership_types/_form.html.haml

@@ -78,7 +78,6 @@
           %span.label.label-success
             Advanced
           This is the number of memberships a patron can purchase in a single transaction. If you're not sure what this means, leave it set to 1.
-          =link_to "More", "https://artfully.zendesk.com/entries/64035707-How-many-memberships-should-I-allow-a-patron-to-buy", :target => "_blank"
       .span9
         = f.select :limit_per_transaction, (1..10), {}, :class => "span2"
     .form-actions

data/app/views/orders/_item_table.haml

@@ -14,8 +14,8 @@
           %th Event
           %th Show Date
           %th Price Paid
-          %th Discount / Pass
-          %th
+          %th Discount/Pass
+          %th Status
       %tbody
         - order.all_items.each do |item|
           %tr{:id => "row_item_#{item.id}", :class => item.state}
@@ -37,8 +37,10 @@
                 %span Donation
               - if item.product_type.eql?("Membership")
                 %span=item.product.membership_type.name
+              - if item.product_type.eql?("Pass")
+                %span=item.product.pass_type.passerize
             %td= link_to item.product.event.name, event_path(item.product.event) if item.product_type.eql?("Ticket")
-            %td= link_to item.product.show.datetime.strftime("%m/%d/%Y"), event_show_path(item.product.event, item.product.show) if item.product_type.eql?("Ticket")
+            %td= link_to item.product.show.parsed_local_datetime.strftime("%m/%d/%Y"), event_show_path(item.product.event, item.product.show) if item.product_type.eql?("Ticket")
             %td.price= amount_and_nongift item
             %td
               =item.discount.try(:code) || item.pass.try(:pass_type).try(:name)

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

@@ -46,8 +46,8 @@
         - if @expired_passes.length > 0
           %tr
             %td{:colspan => 7}
-              = link_to "See #{@expired_count} lapsed & expired memberships", '#', 'ng-show' => '!scope.showExpired', 'ng-click' => 'scope.showExpired = true'
-              = link_to "Hide #{@expired_count} lapsed & expired memberships", '#', 'ng-show' => 'scope.showExpired', 'ng-click' => 'scope.showExpired = false'
+              = link_to "See #{@expired_count} lapsed & expired passes", '#', 'ng-show' => '!scope.showExpired', 'ng-click' => 'scope.showExpired = true'
+              = link_to "Hide #{@expired_count} lapsed & expired passes", '#', 'ng-show' => 'scope.showExpired', 'ng-click' => 'scope.showExpired = false'
 
         - @expired_passes.each do |pass|
           %tr{'ng-show' => 'scope.showExpired', 'ng-style' => 'scope.expiredStyle'}

data/app/views/people/_edit_modal.html.haml

@@ -60,6 +60,13 @@
                 .controls
                   = form.label :email, :class => 'control-label'
                   .control= form.text_field :email
+                .controls.control-label Birthday
+                .year{:data => { 'person-birth_year' => @person.birth_year }}
+                .day{:data => { 'person-birth_day' => @person.birth_day }}
+                  .control
+                    = form.select :birth_month, [["January", 1], ["February", 2], ["March", 3], ["April", 4], ["May", 5], ["June", 6], ["July", 7], ["August", 8], ["September", 9], ["October", 10], ["November", 11], ["December", 12]], { :include_blank => true }, { :class => 'span2', :id => 'birth_month' }
+                    = form.select :birth_day, [], { :include_blank => true }, { :class => 'span1', :id => 'birth_day' }
+                    = form.select :birth_year, [], { :include_blank => true }, { :class => 'span1', :id => 'birth_year' }
                 - if @person.individual? && @person.member.nil?
                   .controls
                     - unless except.include? :convert

data/app/views/people/_work_with_menu.html.haml

@@ -2,7 +2,7 @@
   =icon_link_to('Work with...', "#menu#bulkactions", 'fa-asterisk', 'dropdown-toggle dropdown btn', '')
 
   %ul.dropdown-menu
-    %li= link_to "Edit #{@person.possessive} Info", '#edit-person', 'data-toggle' => 'modal'
+    %li= link_to "Edit #{@person.possessive} Info", '#edit-person', 'data-toggle' => 'modal', :id => "edit_link"
     -with_kit (:membership) do
       -if person.email.blank? || person.company?
         %li= link_to "Comp Membership", "#comp-membership", 'data-toggle' => 'modal'
@@ -17,9 +17,12 @@
         %li= link_to "View Passes", person_passes_path(@person)
 
     %li= link_to "Merge", new_merge_path(:loser => person.id)
+
     - if @person.destroyable?
       %li= link_to "Delete", @person, :method => :delete, :confirm => "Are you sure you want to delete #{@person}?"
 
+    %li= link_to "Sell To", new_console_sale_path(:person_id => person.id)
+
 -if person.email.blank? || person.company?
   -with_kit (:membership) do
     #comp-membership.modal

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

@@ -55,20 +55,29 @@
                 %span.muted
                   == #{Relation.find(group[:relation]).description.titleize.pluralize} (#{group[:count]}) #{link_to("View All", polymorphic_url([@person, :relationships], :relation_id => group[:relation]))} >
 
-      %section#email-subscription
-        %h5 Email Lists
+      %h5 Preferences
+      %section#communication-preference
         = form_for @person do |form|
+          .do-not-call
+            = form.label :do_not_call, :class => "checkbox" do
+              = form.check_box :do_not_call
+              %span Do Not Call
           .do-not-email
             = form.label :do_not_email, :class => "checkbox" do
-              = form.check_box :do_not_email, :class => "checkbox"
+              = form.check_box :do_not_email
               %span Do Not Email
+          = form.submit "Save", :class => 'btn btn-primary hidden'
+
+      %h5 Email Lists
+      %section#subscription-listing
+        = form_for @person do |form|
           - if @person.organization.kits.mailchimp
             .mailchimp-list
               - mailchimp_kit = @person.organization.kits.mailchimp
               = hidden_field_tag "person[subscribed_lists][]", nil, :id => "person_subscribed_lists_empty"
               - mailchimp_kit.attached_lists.each do |list|
                 = label_tag "", :class => "checkbox" do
-                  = check_box_tag "person[subscribed_lists][]", list[:list_id], @person.subscribed_lists.include?(list[:list_id]), :class => "checkbox mail-chimp-list", :disabled => @person.do_not_email
+                  = check_box_tag "person[subscribed_lists][]", list[:list_id], @person.subscribed_lists.include?(list[:list_id]), :class => "mail-chimp-list", :disabled => @person.do_not_email
                   %span= list[:list_name]
           = form.submit "Save", :class => 'btn btn-primary hidden'
 

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

@@ -57,4 +57,4 @@
                 ="Put these tickets back on sale."
 
       %p
-        = submit_tag "Issue Refund ", :class => "btn"
+        = submit_tag "Issue Refund", :class => "btn", :id => "issue-refund-button", :disable_with => "Refunding..."

data/app/views/sales/_boxoffice.html.haml

@@ -0,0 +1,141 @@
+= form_tag event_show_sales_path, :class => 'boxoffice-form' do |f|
+  .row
+    .span2
+      %h6.padded-left 1. Tickets
+    .span10
+      .ticket-list
+        // unavailable tickets at the bottom
+        - @sale.ticket_types.sort_by { |t| -@tickets_remaining[t.id] }.each do |ticket_type|
+          .ticket{:class => ('unavailable' if @tickets_remaining[ticket_type.id] < 1), 'data-ticket-id' => ticket_type.id}
+            %a.ticket-quantity-button.subtract -
+            = number_field_tag "quantities[#{ticket_type.id}]", 0, :class => 'ticket-quantity', 'data-remaining' => @tickets_remaining[ticket_type.id], 'data-ticket-price' => number_to_dollars(ticket_type.price), :disabled => (@tickets_remaining[ticket_type.id] < 1)
+            %a.ticket-quantity-button.add +
+            %span.lead.ticket-type
+              %strong= ticket_type.name
+              = number_as_cents(ticket_type.price, cents_if_needed:true)
+              %span.muted
+                (#{content_tag :span, @tickets_remaining[ticket_type.id], :class => 'remaining', 'data-ticket-id' => ticket_type.id} remaining)
+
+        - if @event.organization.authorization_hash[:authorized]
+          .ticket
+            .input-prepend
+              %span.add-on $
+              = number_field_tag 'donation', nil, :placeholder => '0.00', :id => 'order-donation', :class => 'order-donation'
+              %span.lead
+                %strong
+                  Donation
+
+        - if Discount.where(event_id:@event.id).any?
+          .discount
+            .ticket
+              .input
+                = text_field_tag 'discount', nil, :id => 'order-discount', :class => 'order-discount'
+                %span.lead
+                  %strong
+                    Discount Code
+
+            .ticket
+              .input
+                %span.lead.message
+
+        #order-total
+          %h3
+            .loading.hide
+              #{image_tag('loading.gif')} calculating total...
+            .message
+              $0.00 Total
+          = hidden_field_tag 'total'
+  .row.row-blue-padded
+    .span2
+      .row-blue-padded-left
+        %h6 2. Payment
+    .span10
+      .control-group
+        .btn-toolbar.payment-select
+          .btn-group
+            %a.btn{'data-payment-select' => 'cash'}
+              Cash
+            %a.btn{'data-payment-select' => 'credit'}
+              Credit
+            %a.btn{'data-payment-select' => 'check'}
+              Check
+            %a.btn{'data-payment-select' => 'comp'}
+              Comp
+        = hidden_field_tag 'payment_method'
+      #credit-fields.payment-fields{:style => 'display:none;'}
+        .control-group
+          %label
+            Card Number
+            %span.muted.required (required)
+          .controls= text_field_tag("credit_card[number]", params[:credit_card][:card_number], :placeholder => "XXXX-XXXX-XXXX-XXXX", :class => 'input-medium credit_card_number')
+        .control-group
+          %label
+            Card Expiration
+            %span.muted.required (required)
+          .date_field.controls
+            = select_tag("credit_card[month]", options_for_select(1..12, params[:credit_card]["month"]), :class => 'input-small inline')
+            = select_tag("credit_card[year]", options_for_select(Time.now.year..Time.now.year + 10, params[:credit_card]["year"]), :class => 'input-small inline')
+      #check-fields.payment-fields{:style => 'display:none;'}
+        .control-group
+          = label_tag("check[number]", "Check Number")
+          .controls= text_field_tag("check[number]", params[:check].try([:number]), :class => 'input-medium')
+
+  .row
+    .span2
+      %h6.padded-left 3. Buyer Info
+    .span10
+      #user-info
+        #existing-user-popover
+        = hidden_field_tag(:person_id, "", :name => "person[id]")
+        .control-group
+          %label
+            First Name
+            %span.muted.required.name-required{:style => 'display:none;'} (required)
+          .controls
+            = text_field_tag(:person_first_name, "", :id => "person_first_name", :name => "person[first_name]", :placeholder => "First name", :class => 'person_first_name')
+        .control-group
+          %label
+            Last Name
+            %span.muted.required.name-required{:style => 'display:none;'} (required)
+          .controls
+            = text_field_tag(:person_last_name, "", :id => "person_last_name", :name => "person[last_name]", :placeholder => "Last name", :class => 'person_last_name')
+        .control-group
+          %label
+            Email
+            %span.muted.required.contact-required{:style => 'display:none;'} (required or phone)
+          .controls= email_field_tag(:person_email, "", :id => "person_email", :name => "person[email]", :placeholder => "example@email.com", :class => 'person_email')
+        .control-group
+          %label
+            Phone Number
+            %span.muted.required.contact-required{:style => 'display:none;'} (required or email)
+          .controls
+            = text_field_tag(:person_phone, "", :id => "person_phone", :name => "person[phones_attributes][][number]", :placeholder => "(XXX) XXX-XXXX", :class => 'person_phone')
+        .control-group
+          %label
+            Order Notes
+            %span.muted.required
+          .controls= text_area_tag(:order_notes, "", :id => "order_notes", :name => "order_notes")
+
+  .row.row-blue-padded
+    .span2
+      .row-blue-padded-left
+        %h6 4. Check in
+    .span10
+      .control-group
+        %label.checkbox
+          = check_box_tag "auto_check_in"
+          Mark tickets as received on doorlist.
+
+  .row
+    .span10.offset2
+      = submit_tag 'Checkout', :class => 'btn btn-large', :disabled => 'disabled', :id => 'checkout-now-button'
+
+#submit-confirmation.modal.hide.fade
+  .modal-header
+    %button.close.modal-close.hide{'type' => 'button', 'data-dismiss' => 'modal'} x
+    %h3 Processing...
+  .modal-body
+    .loading= image_tag('loading.gif')
+    .content
+  .modal-footer
+    %button.btn.btn-primary.modal-close.hide{'data-dismiss' => 'modal'} Close

data/app/views/sales/_doorlist.html.haml

@@ -0,0 +1,79 @@
+.row.row-blue-padded
+  .span4.relative
+    .row-blue-padded-left
+      .progress.progress-doorlist
+        .bar.bar-doorlist
+  .span8
+    .row-blue-padded-right
+      .btn-group.download-door-list
+        %a.btn.dropdown-toggle{'data-toggle' => 'dropdown', 'href' => '#'}
+          %i.fa.fa-arrow-circle-down
+          Download Door List
+        %ul.dropdown-menu
+          %li= link_to 'CSV Download', door_list_event_show_path(@event, @show, :format => :csv)
+          %li= link_to 'PDF Download', door_list_event_show_path(@event, @show, :format => :pdf)
+      %span.search-container
+        = search_field_tag :live_search, nil, :placeholder => 'Search Door List', :class => 'span7', :class => 'search-doorlist'
+
+.row
+  .span4.relative
+    #buyer-details
+  .span8
+    #door-list-table
+      %table#door-list.table
+        %tbody
+          - tickets_grouped_by_buyer = @door_list.items.group_by {|i| i.buyer }.sort_by { |buyer, door_list_items| door_list_sort(buyer) }
+          - tickets_grouped_by_buyer.each do |buyer, door_list_items|
+            - special_instructions = door_list_grouped_attribute(door_list_items, :special_instructions)
+            - order_notes = door_list_grouped_attribute(door_list_items, :notes)
+            %tr.buyer{'data-buyer-id' => buyer.id, :id => "buyer-#{buyer.id}", 'data-search-blob' => "#{buyer.first_name} #{buyer.last_name} #{special_instructions} #{order_notes}"}
+              %td
+                %h4
+                  - if door_list_items.select {|d| !d.ticket.validated? }.empty?
+                    %i.remaining-ticket-indicator.fa.fa-circle
+                  - elsif door_list_items.select {|d| d.ticket.validated? }.any?
+                    %i.remaining-ticket-indicator.fa.fa-adjust
+                  - else
+                    %i.remaining-ticket-indicator.fa.fa-circle-o
+                  = door_list_name_and_company(buyer)
+                  - if special_instructions.present? || order_notes.present?
+                    %i.fa.fa-file
+              %td.buyer-ticket-count
+                %strong= door_list_items.length
+                ticket#{'s' unless door_list_items.length == 1}
+              %td.buyer-total
+                - amount = door_list_items.map {|d| d.ticket.sold_price }.inject(:+)
+                = number_as_cents(amount, cents_if_needed:true)
+                %br
+                = door_list_items.map {|d| d.payment_method }.uniq.to_sentence
+                .buyer-details-hidden{:style => 'display:none;', :id => "buyer-details-#{buyer.id}"}
+                  %h1= link_to buyer.to_s, buyer
+                  .content
+                    %ul
+                      - door_list_items.sort_by {|d| d.ticket.ticket_type }.each do |door_list_item|
+                        %li
+                          %p
+                            %label.lead
+                              = check_box_tag "validated", "validated", door_list_item.ticket.validated, :class => 'door-list-checkbox', 'data-ticket-id' => door_list_item.ticket.id, 'data-buyer-id' => buyer.id
+                              %strong
+                                = door_list_item.ticket.ticket_type.name
+                              = number_as_cents(door_list_item.ticket.sold_price, cents_if_needed:true)
+                              = door_list_item.payment_method
+                    %p
+                      -# We don't modify tickets after the show date, so there's the posibility that the
+                      -# ticket can be refunded after the show. The ticket remains "sold" but has no sold_item
+                      -# and it appears to the door list that it has no order. This is why we
+                      -# .select on the end of this statement.
+                      - order_ids = door_list_items.collect(&:order_id).uniq.select{|order| order.present?}
+                      %strong.muted Order#{'s' if order_ids.count > 1}:
+                      = safe_join(order_ids.map{|o| link_to o, order_path(o)}, ', ')
+
+                    - if special_instructions.present?
+                      %p
+                        %strong.muted Special Instructions:
+                        = special_instructions
+
+                    - if order_notes.present?
+                      %p
+                        %strong.muted Notes:
+                        = order_notes