artfully_ose 1.2.0.beta.1 → 1.2.0.pre

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

@@ -1,5 +1,3 @@
-- content_for :custom_js do
-  = javascript_include_tag "relationships"
 - in_section :people
 - content_for :title do
   #{@person}
@@ -8,10 +6,11 @@
 
 .row
   .span4
-
     -unless @person.dummy?
-      %p= render :partial => 'work_with_menu', :locals => {:person => @person}
-      = render @person.address unless @person.address.new_record?
+      %p= link_to "Edit #{@person.possessive} Info", '#edit-person', 'data-toggle' => 'modal'
+      / %p= link_to "Award Membership", new_person_membership_award_path(@person)
+
+      = render @person.address
 
       %ul
         - @person.phones.each do |phone|
@@ -19,67 +18,22 @@
             %span.muted= phone.kind
             = phone.number
 
-      -with_kit(:relationships) do
-        %section
-          - if @person.household.present?
-            %h5
-              == Household (#{link_to "view", @person.household})
-            %ul
-              - @person.household.individuals.where('id != ?', @person.id).each do |individual|
-                %li
-                  %span.starable-spacer
-                    ✭
-                  %span.muted
-                  = link_to(individual, polymorphic_url(individual))
-
-          %h5 Relationships
-          - struct = relationships_struct(@person)
-          %ul
-            - struct[:starred].each do |relationship|
-              %li
-                %span.starred.starable{"data-person-id" => relationship.person.id, "data-type" => 'relationship', "data-action-id" => relationship.id, :class => (relationship.starred? ? "active" : "not-active") }
-                  ✭
-                %span.muted= relationship.relation.description.humanize
-                = link_to(relationship.other(@person), polymorphic_url(relationship.other(@person)))
-
-            - @person.relationships.unstarred.where(:relation_id => struct[:single]).each do |relationship|
-              %li
-                %span.starred.starable{"data-person-id" => relationship.person.id, "data-type" => 'relationship', "data-action-id" => relationship.id, :class => (relationship.starred? ? "active" : "not-active") }
-                  ✭
-                %span.muted= relationship.relation.description.humanize
-                = link_to(relationship.other(@person), polymorphic_url(relationship.other(@person)))
-            - struct[:grouped].each do |group|
-              %li
-                %span.starable-spacer
-                  ✭
-                %span.muted
-                  == #{Relation.find(group[:relation]).description.titleize.pluralize} (#{group[:count]}) #{link_to("View All", polymorphic_url([@person, :relationships], :relation_id => group[:relation]))} >
-
-      %h5 Preferences
-      %section#communication-preference
+      %section#email-subscription
+        %h5 Email Lists
         = 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
+              = form.check_box :do_not_email, :class => "checkbox"
               %span Do Not Email
-          = form.submit "Save", :class => 'btn btn-primary hidden'
-
-      - with_kit(:mailchimp) do
-        %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 => "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 => "checkbox mail-chimp-list", :disabled => @person.do_not_email
                   %span= list[:list_name]
-            = form.submit "Save", :class => 'btn btn-primary hidden'
+          = form.submit "Save", :class => 'btn btn-primary hidden'
 
   .span8
     #notes
@@ -87,7 +41,7 @@
       .span3
         %h3 Notes
       .span9
-        = icon_link_to("Add", new_person_note_path(@person, :format => :html), 'fa-plus-circle', 'btn new-note-link', '')
+        = icon_link_to("Add", new_person_note_path(@person, :format => :html), 'icon-plus-sign', 'btn new-note-link', '')
     .person-inline-form.new-note-form{:style => 'display:none;'}
       = form_for [@person, Note.new] do |form|
         = form.text_area :text, :size => "125x5", :class => 'input-xxlarge', :placeholder => "This is a good place for little nuggets about #{@person} you don't want to forget..."
@@ -115,7 +69,7 @@
         .span3
           %h3 Action Feed
         .span9
-          = icon_link_to("Add", new_person_action_path(@person, :format => :html, :type => :hear), 'fa-plus-circle', 'btn new-action-link', '')
+          = icon_link_to("Add", new_person_action_path(@person, :format => :html, :type => :hear), 'icon-plus-sign', 'btn new-action-link', '')
 
       .person-inline-form.action-form.new-action-form{:style => 'display:none;'}
         = render :partial => 'actions/inline', :locals => {:target => @person, :action => @new_action}
@@ -132,8 +86,8 @@
             %tr
               %td
               %td
-              %td
-              %td
+              %td 
+              %td 
                 No actions for this
                 = @person.individual? ? "individual." : "record."
           - else
@@ -146,14 +100,13 @@
   = render 'convert_to_company_modal'
   #edit-order-popup.modal
 
--with_kit(:mailchimp) do
-  - if current_user.current_organization.kits.mailchimp
-    .modal#subscribe-modal(role="dialog")
-      .modal-header
-        %button(type="button" class="close" data-dismiss="modal" aria-hidden="true") ×
-        %h3 MailChimp List Subscription
-      .modal-body
-        %p #{@person} will receive an email from MailChimp confirming their addition to this list
-      .modal-footer
-        %button(class="btn" data-dismiss="modal" aria-hidden="true") Cancel
-        %button(class="btn btn-primary") OK
+- if current_user.current_organization.kits.mailchimp
+  .modal#subscribe-modal(role="dialog")
+    .modal-header
+      %button(type="button" class="close" data-dismiss="modal" aria-hidden="true") ×
+      %h3 MailChimp List Subscription
+    .modal-body
+      %p #{@person} will receive an email from MailChimp confirming their addition to this list
+    .modal-footer
+      %button(class="btn" data-dismiss="modal" aria-hidden="true") Cancel
+      %button(class="btn btn-primary") OK

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

@@ -1,60 +1,42 @@
-- in_section :transactions
+- in_section :people
+- content_for :header do
+  %h1 Refund Tickets
 
 .row
-  .span8.offset2#refund-contaner
-    %h1 Refund Order
-
-    %p
-    -if @order.credit?
-      ="#{@order.person} will receive a refund credited to the card that he/she used to as payment for this order."
-    -else
-      ="#{@order.person} paid with #{@order.payment_method.downcase}. Artful.ly will process the tickets and donations as refunded but you'll need to settle any money owed to #{@order.person} manually." 
-
-
+  .span8.offset2
     = form_tag refunds_path do
+
       = hidden_field_tag :order_id, @order.id
+
       - @items.each do |item|
         = hidden_field_tag "items[]", item.id
 
-      %h2=refund_header(@items)
-
-      %table.table#refund-ticket-table
+      %table.table
         %thead
           %tr
             %th
-              Details
-            %th.right
+              Event
+            %th
+              Show
+            %th
+              Price
+            %th
               Sold
         - @items.each do |item|
           - if item.ticket?
-            %tr.refund-ticket-row
-              %td="#{item.product.show.event.name} #{l item.product.show.datetime_local_to_event, :format => :short}"
-              %td.right=number_as_cents item.price
-          - if item.donation?
-            %tr.refund-donation-row
-              %td="Donation"
-              %td.right=number_as_cents item.price
-          - if item.pass?
-            %tr.refund-pass-row
-              %td="Pass"
-              %td.right=number_as_cents item.price
-
-      %h2 Options
-      .well
-
-        - unless @order.skip_confirmation_email?
-          .control-group
-            .controls
-              %label.checkbox
-                = check_box_tag :send_email_confirmation, "1", ""
-                ="Send an email confirmation to #{@order.person.email}."
-
-        - if @items.select(&:ticket?).any?
-          .control-group
-            .controls
-              %label.checkbox
-                = check_box_tag :return_to_inventory, "1", ""
-                ="Put these tickets back on sale."
+            %tr
+              %td=item.product.show.event.name
+              %td=l item.product.show.datetime_local_to_event, :format => :short
+              %td=number_as_cents item.product.price
+              %td=number_as_cents item.price
 
       %p
-        = submit_tag "Issue Refund", :class => "btn", :id => "issue-refund-button", :disable_with => "Refunding..."
+        Refund these tickets and return them to inventory
+        %br
+        = submit_tag "Issue Refund and Return", :class => "btn"
+      %p
+        %br
+      %p
+        Refund these tickets and keep the tickets out of inventory.
+        %br
+        = submit_tag "Issue Refund", :class => "btn"

data/app/views/reports_mailer/daily.html.haml

@@ -4,44 +4,37 @@
   =l @tix.start_date, :format => :date
   = number_to_currency((@tix.total + @donations.total) / 100.0)
 
-:css
-  th.order     { width: 60px; }
-  th.customer  { width: 140px;}
-  th.total     { width: 80px; text-align: right }
-  td.total     { text-align: right }
-  td           { vertical-align: top}
-  table        { margin-bottom: 50px }
-
 %h1
   Daily Total: #{number_to_currency((@tix.total + @donations.total) / 100.0)}
 %h2
   #{@tix.organization.name}: #{l @tix.start_date, :format => :date}
 
-- if !@tix.rows.empty?
+- if ! @tix.rows.empty?
   %h3 Tickets: #{number_to_currency(@tix.total / 100.0)}
   %table.tabular-data{:cellspacing => "0"}
     %tr
-      %th.order Order
-      %th.customer Customer
-      %th Details
-      %th.total Total
+      %th Order
+      %th Total
+      %th Customer
+      %th.w200 Details
+      %th Special Instructions
     - @tix.rows.each do |row|
       %tr
         %td.order-number= link_to row.id, order_url(id: row.id)
-        %td= link_to row.person, person_url(id: row.person_id)
-        %td
-          = row.ticket_details
-          %br 
-          %br
-          = row.special_instructions
         %td.total= row.total
+        %td= link_to row.person, person_url(id: row.person_id)
+        %td.w200= row.ticket_details
+        %td= row.special_instructions
+- else
+  %p There were no ticket orders placed.
+
 
-- if !@tix.exchange_rows.empty?
+- if ! @tix.exchange_rows.empty?
   %h3 Exchanges
   %table.tabular-data{:cellspacing => "0"}
     %tr
-      %th.order Order
-      %th.customer Customer
+      %th Order
+      %th Customer
       %th Details
     - @tix.exchange_rows.each do |row|
       %tr
@@ -49,81 +42,23 @@
         %td= link_to row.person, person_url(id: row.person_id)
         %td= row.ticket_details
 
-- if !@donations.rows.empty?
+- if ! @donations.rows.empty?
   %h3 Donations: #{number_to_currency(@donations.total / 100.0)}
   %table.tabular-data{:cellspacing => "0"}
     %tr
-      %th.order Order
-      %th.customer Customer
-      %th Details
-      %t.total Total
+      %th Order
+      %th Donation
+      %th Customer
     - @donations.rows.each do |row|
       %tr
         %td.order-number= link_to row.id, order_url(id: row.id)
-        %td= link_to row.person, person_url(id: row.person_id)
-        %td
         %td.total= row.total
-
-- if !@passes.rows.empty?
-  %h3 Passes: #{number_to_currency(@passes.total / 100.0)}
-  %table.tabular-data{:cellspacing => "0"}
-    %tr
-      %th.order Order
-      %th.customer Customer
-      %th #
-      %th Pass
-      %th.total Total
-    - @passes.rows.each do |row|
-      %tr
-        %td.order-number= link_to row.id, order_url(id: row.id)
         %td= link_to row.person, person_url(id: row.person_id)
-        %td=row.quantity
-        %td=row.pass_type
-        %td.total= row.total
-
-- if !@memberships.rows.empty?
-  %h3 Memberships: #{number_to_currency(@memberships.total / 100.0)}
-  %table.tabular-data{:cellspacing => "0"}
-    %tr
-      %th.order Order
-      %th.customer Customer
-      %th #
-      %th Membership
-      %th.total Total
-    - @memberships.rows.each do |row|
-      %tr
-        %td.order-number= link_to row.id, order_url(id: row.id)
-        %td= link_to row.person, person_url(id: row.person_id)
-        %td=row.quantity
-        %td=row.membership
-        %td.total= row.total
-
-  - if @memberships.lapsed_memberships.any?
-    %h3 Membership Lapses
-    %table.tabular-data{:cellspacing => "0"}
-      %tr
-        %th.customer Customer
-        %th Membership
-      - @memberships.lapsed_memberships.each do |membership_lapse|
-        %tr
-          %td.order-number= link_to membership_lapse.member.person, person_url(membership_lapse.member.person)
-          %td=membership_lapse.membership_type.name
-
-
-- if @tix.rows.empty?
-  %p There were no ticket orders placed.
-
-- if @donations.rows.empty? && @tix.organization.has_kit?(:regular_donation)
+- elsif @tix.organization.has_kit?(:regular_donation)
   %p There were no donations made.
 
-- if @passes.rows.empty? && @tix.organization.has_kit?(:passes)
-  %p There were no passes purchased.
-
-- if @memberships.rows.empty? && @tix.organization.has_kit?(:membership)
-  %p There were no memberships purchased.
-
 - content_for :footer do
   = render :partial => "fine_print"
   %p
     To turn off this daily email report,
-    = link_to "edit your organization here.", edit_organization_url(@tix.organization)
+    = link_to "edit your organization here.", edit_organization_url(@tix.organization)

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

@@ -1,37 +1,129 @@
-= stylesheet_link_tag 'boxoffice'
 - content_for :custom_js do
-  = javascript_include_tag 'boxoffice'
-  :javascript
-    $(document).ready(function() {
-      // we wait to do this transition so
-      // users can see they have 2 nav options
-      setTimeout(
-        function(){
-          if(#{params[:render].present?}) {
-            switchBetweenBoxofficeAndDoorlist('#' + '#{params[:render]}');
-          } else {
-            // show doorlist
-            switchBetweenBoxofficeAndDoorlist('#doorlist');
-          }
-        }, 500)
-    })
+  = javascript_include_tag "box-office"
+- in_section :events
+- content_for :header do
+  %h1 Box Office
 
-.row
-  .span12
-    %h3.event-name
-      = link_to @event.name, @event
-      %span.event-time= link_to l(@show.datetime_local_to_event, :format => :day_time), event_show_path(@event,@show)
-    %ul.nav.nav-pills.page-nav
-      %li= link_to 'Door List', '#doorlist'
-      %li= link_to 'Sell Tickets', '#boxoffice'
+= form_tag event_show_sales_path, :remote => true, :class => 'box-office-form' do
+  = hidden_field_tag :commit, ""
+  #showtime-total-and-checkout.row-fluid
+    .row-fluid.span8
+      #event-image.span2
+        = render :partial => 'shared/event_image_icon', :locals => { :event => @event }
+      #showtime.span4
+        %strong="#{@event.name}"
+        %br
+        ="#{l(@show.datetime_local_to_event, :format => :long_with_day)}"
+        %br
+        =icon_link_to("Return to show", event_show_path(@show.event, @show), 'icon-share-alt', 'btn', '')
+    #total-and-checkout.span4{:style => 'text-align:right' }
+      .row-fluid
+        .span6
+          #total.total
+            .price= number_as_cents 0
+        .span6
+          #checkout-now
+            %button.btn.btn-large.btn-success#checkout-now-button{:style => 'width:100%'}
+              Checkout
+  .row
+    .span4
+      %h6 Tickets
+      - @sale.ticket_types.each do |ticket_types|
+        .row-fluid
+          .span9.ticket-type-description
+            .name= label_tag "quantities[#{ticket_types.id}]", "#{truncate(ticket_types.name, :length => 25)} #{number_as_cents(ticket_types.price)}"
+            .description{:id => "remaining_#{ticket_types.id}"}="#{@tickets_remaining[ticket_types.id]} remaining"
+          .span3
+            = select_tag "quantities[#{ticket_types.id}]", options_for_select(0..20, @sale.quantities[ticket_types.id]), :class => @tickets_remaining[ticket_types.id] > 0 ? 'ticket-quantity-select input-mini' : 'hidden ticket-quantity-select input-mini'
+            .sold-out{:id => "sold_out_#{ticket_types.id}", :class => @tickets_remaining[ticket_types.id] > 0 ? 'hidden' : ''}
+              %span.label.label-success
+                sold-out
 
-:css
-  .footer {
-    display:none;
-  }
+    .span4
+      %h6 Customer
+      .controls#the-details
+        = hidden_field_tag(:person_id, "", :id => "person_id", :name => "person[id]")
+        .control-group
+          %label First Name
+          .controls= text_field_tag(:person_first_name, "", :id => "person_first_name", :name => "person[first_name]")
+        .control-group
+          %label Last Name
+          .controls= text_field_tag(:person_last_name, "", :id => "person_last_name", :name => "person[last_name]")
+        .control-group
+          %label Email
+          .controls= text_field_tag(:person_email, "", :id => "person_email", :name => "person[email]")
+
+    .span4
+      %h6 Payment
+      #payment-controls.controls
+        %label.radio
+          = radio_button_tag(:payment_method, :cash, true, :class => 'payment-method', :disabled => 'true', :humanized_value => 'Cash')
+          Cash
+        %label.radio
+          = radio_button_tag(:payment_method, :comp, false, :class => 'payment-method', :disabled => 'true', :humanized_value => 'Comp')
+          Comp
+        -unless @event.is_free
+          %label.radio
+            = radio_button_tag(:payment_method, :credit_card_swipe, false, :class => 'payment-method', :disabled => 'true', :humanized_value => 'Credit card')
+            Credit (Swipe)
+          %label.radio
+            = radio_button_tag(:payment_method, :credit_card_manual, false, :class => 'payment-method', :disabled => 'true', :humanized_value => 'Credit card')
+            Credit (Manual)
+      #payment-info.hidden
+        .control-group
+          = label_tag("credit_card[cardholder_name]", "Name on Card")
+          .controls= text_field_tag("credit_card[name]", params[:credit_card][:cardholder_name])
+        .control-group
+          = label_tag("credit_card[card_number]", "Card Number")
+          .controls= text_field_tag("credit_card[number]", params[:credit_card][:card_number])
+        .control-group
+          = label_tag("credit_card[expiration_date]", "Expiration Date")
+          .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')
+            
+
+#door-list
+  %h3 Door List
+  = render :partial => 'shared/door_list_table', :locals => { :door_list_items => @door_list.items}
+            
+#sell-popup.modal
+  .modal-header
+    %h2 Checkout
+  .modal-body
+    #salesperson-alert.alert.alert-info
+      Swipe card to complete transaction
+
+    .shadowed.block
+      .row-fluid.block
+        .span6
+          #sell-total.total
+            %strong.price= number_as_cents 0
+        
+        .span6
+          .picked-person
+            #picket-person-name-in-popup.picked-person-name.picked-person-clear
+              No buyer information
+            .picked-person-email.picked-person-clear
+        
+          #payment-method-popup
+            Cash
+      
+    .block  
+      #popup-ticket-list
+        %table.table
+          %thead
+            %tr
+              %th
+                Ticket Type
+              %th
+                Price
+          %tbody
+        
+  .modal-footer
+    %input#hack-cc-number.hidden{:name=>'hack-cc-number'}
+    %button#sell-button.btn.btn-large.btn-success{:name => 'commit', :label => 'true'}
+      Sell
+    %button#cancel-button.btn.btn-large
+      Cancel
 
-#page-holder
-  #doorlist.page{'data-partial-href' => "#{door_list_event_show_sales_path(@event,@show)}"}
-    = render 'doorlist'
-  #boxoffice.page
-    = render 'boxoffice'