artfully_ose 1.2.0 → 1.3.0.pre1

data/app/views/merges/find_person.html.haml

@@ -12,13 +12,15 @@
           = text_field_tag :search, "", :placeholder => "Email address or name", :class => "input-medium search-query"
           = submit_tag "Search", :class => 'btn'
     %p
-      All notes, actions, phone numbers, and tags from 
+      All notes, actions, mailing addresses, phone numbers, and tags from
       %strong= @loser
       will be merged into the #{@loser.type.downcase} record you select on this screen.
+
     %p
-      Mailing address, email, company name, and website for
+      The following will be retained from
       %strong= @loser
-      will be discarded.
+      if not present in the record you select: email, middle name, company name, nickname, listing name, maiden name, title, salutation, suffix, twitter handle, facebook url, linkedin url, website, and birth date.
+
     %p
       You'll have a chance to confirm all of this before we perform the merge.
   .span8.super-search-results

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

@@ -16,19 +16,28 @@
       %strong= @winner
 
     %p
-      All notes, actions, phone numbers, and tags from 
+      All notes, actions, mailing addresses, phone numbers, and tags from
       %strong= @loser
       will be merged into
       %strong= @winner
 
     %p
-      Mailing address, email, company name, and website for
+      Email, middle name, company name, nickname, listing name, title, salutation, suffix, twitter handle, facebook url, linkedin url, website, and birth date for
       %strong= @loser
-      will be discarded.
+      will be added to
+      %strong= @winner
+      if they do not already exist.
+
+    - if @loser.memberships.present?
+      %p
+        Memberships from 
+        %strong= @loser
+        will be added to
+        %strong= @winner
     
     =form_tag merges_path do
       = hidden_field_tag 'winner', @winner.id
       = hidden_field_tag 'loser', @loser.id
       .form-actions
         =submit_tag "Merge", :class => 'btn btn-large btn-success'
-        =link_to "Cancel", person_path(@loser), :class => 'btn btn-large btn-danger'
+        =link_to "Cancel", person_path(@loser), :class => 'btn btn-large'

data/app/views/notes/_note.html.haml

@@ -7,14 +7,14 @@
         = truncate(note.text, :length => 100, :separator => ' ', :omission => '...')
       .not-truncated{:style => 'display:none;'}
         = simple_format note.text
-        %p.muted= l note.created_at, :format => :short unless note.created_at.nil?
-        %p
-          = link_to("Edit", edit_person_note_path(note.person, note, :format => :html), :class => "btn btn-mini edit-note-link")
+        = link_to("Edit", edit_person_note_path(note.person, note, :format => :html), :class => "btn btn-mini edit-note-link")
 
   %td.person-inline-form.edit-note-form{:style => 'display:none;', :colspan => 2}
     %h4 Edit Note
     = form_for [note.person, note] do |form|
+      = form.text_field :occurred_at, :value => l(note.occurred_at_local_to_organization, :format => :datetime_for_input), :readonly => true, :class => [:datetimepicker, 'input-medium'], :id => "datetimepicker_#{note.id}"
       = form.text_area :text, :size => "125x5", :class => 'input-xxlarge'
+      %p= "Creator: #{note.user || 'System'}"
       = link_to "delete", "#delete-confirm-note-#{note.id}", :class => "delete-confirm-link delete-with-trash", "data-toggle" => "modal"
       = form.submit "Save", :class => "btn btn-primary"
       = link_to 'Cancel', '#', :onclick => "$(this).parents('tr').find('td').show(); $(this).parents('tr').find('.edit-note-form').hide()", :class => 'btn'

data/app/views/order_mailer/confirmation_for.html.haml

@@ -33,6 +33,7 @@
           %li
             %span.price= "#{ticket.ticket_type.name}: $#{format("%.2f", (ticket.sold_price/100.0))}"
         %li{:style => 'list-style-type:none'}=ticket_type.description
+        %li{:style => 'list-style-type:none'}=ticket_type.receipt_details
 
     =link_to image_tag("https://maps.google.com/maps/api/staticmap?size=240x140&maptype=roadmap&markers=color:red|#{row.show.event.venue.address_as_url_query}&sensor=false&zoom=15"), "https://maps.google.com/maps?q=#{row.show.event.venue.address_as_url_query.html_safe}&z=15"
     %div

data/app/views/order_mailer/confirmation_for.text.haml

@@ -33,6 +33,7 @@ Order confirmation
       -ticket_type.tickets.each do |ticket|
         = "#{ticket.ticket_type.name}: $#{format("%.2f", (ticket.sold_price/100.0))}"
       =ticket_type.description
+      =ticket_type.receipt_details
 
 
 

data/app/views/orders/_assignable_donations.html.haml

@@ -0,0 +1,25 @@
+.modal{:id => "assignable_donations"}
+  .modal-header
+    .close{'data-dismiss'=>'modal'} x
+    %h3 Select Order
+  = form_tag assign_order_path(order_id),  :method => :post, :class => "sliding-wizard form-horizontal" do
+    .modal-body
+      %table.table
+        %tr
+          %th
+          %th Order
+          %th Time
+          %th Person/Company
+          %th Amount
+        - @order.assignable_donations.each_with_index  do |order, index|
+          %tr
+            %td= radio_button_tag :order_id, order.id, index == 0 ? true : false
+            %td= link_to order.id, order_path(order.id)
+            %td= l order.created_at_local_to_organization
+            %td= link_to_person order.person
+            %td= number_as_cents order.sum_donations
+
+
+    .modal-footer
+      = link_to 'Cancel', '#', :class => 'btn', 'data-dismiss' => 'modal'
+      = submit_tag 'Assign', :class => 'btn btn-primary'

data/app/views/orders/_assignable_pledges.html.haml

@@ -0,0 +1,26 @@
+.modal{:id => "assignable_pledges"}
+  .modal-header
+    .close{'data-dismiss'=>'modal'} x
+    %h3 Select Pledge
+  = form_tag convert_to_pledge_payment_order_path(order_id), :method => :post, :class => "sliding-wizard form-horizontal" do
+
+    .modal-body
+      %table.table
+        %tr
+          %th
+          %th Order
+          %th Time
+          %th Person/Company
+          %th Amount
+        - @order.assignable_pledges.each_with_index  do |order, index|
+          %tr
+            %td= radio_button_tag :order_id, order.id, index == 0 ? true : false
+            %td= link_to order.id, order_path(order.id)
+            %td= l order.created_at_local_to_organization
+            %td= link_to_person order.person
+            %td= number_as_cents order.sum_donations
+
+
+    .modal-footer
+      = link_to 'Cancel', '#', :class => 'btn', 'data-dismiss' => 'modal'
+      = submit_tag 'Convert', :class => 'btn btn-primary'

data/app/views/orders/_item_table.haml

@@ -1,10 +1,18 @@
 #items
   = form_tag do
-    -unless is_child
-      .row-fluid
-        .span4.grouped-form-target{:style => 'width:210px'}
-        .span8{:style => 'margin-top:5px'}
-          %span.help.tight{'data-placement' => 'bottom', 'data-title' => 'Refund/Exchange/Return', 'data-content' => "<p><b>Refund</b> Refunds full price of the ticket to the patron.</p><br/><p><b>Exchange</b> Swaps this ticket for another ticket, no money is charged or refunded.</p><br/><p><b>Return</b> Returns a ticket to inventory.  Use this to return comp'd tickets.".html_safe} ?
+    -unless is_child    
+      - if current_user.can? :manage, Order
+        - help_title = 'Refund/Exchange/Return'
+        - help_text = "<p><b>Refund</b> Refunds full price of the ticket to the patron.</p><br/><p><b>Exchange</b> Swaps this ticket for another ticket, no money is charged or refunded.</p><br/><p><b>Return</b> Returns a ticket to inventory.  Use this to return comp'd tickets.</p>"
+        - grouped_form_target_width = 210
+        - if current_user.current_organization.has_kit?(:regular_donation)
+          - help_text += "<br/><p><b>Convert</b> Convert tickets into a donation. Return tickets to inventory."
+          - help_title += '/Convert'
+          - grouped_form_target_width = 280
+        .row-fluid
+          .span6.grouped-form-target{:style => "width:#{grouped_form_target_width}px"}
+          .span6{:style => 'margin-top:5px'}
+            %span.help.tight{'data-placement' => 'bottom', 'data-title' => help_title, 'data-content' => help_text.html_safe} ?
     %table.zebra.table#item-table
       %thead
         %tr
@@ -34,7 +42,7 @@
                 - unless item.product.ticket_type == nil
                   %span=item.product.ticket_type.name
               - if item.product_type.eql?("Donation")
-                %span Donation
+                %span= order.gift_type
               - if item.product_type.eql?("Membership")
                 %span=item.product.membership_type.name
               - if item.product_type.eql?("Pass")
@@ -45,6 +53,10 @@
             %td
               =item.discount.try(:code) || item.pass.try(:pass_type).try(:name)
             %td.state
-              -if (item.product_type.eql?('Ticket') && !item.purchased?)
+              -if (item.product_type.eql?('Donation') && !is_child && order.is_pledge)
+                - if(order.fully_paid?)
+                  %span.round_tag Paid in full
+                - else
+                  %span.round_tag{:style => 'background-color: #FF9966'} Outstanding
+              -elsif item.state.present?
                 = item.state.capitalize
-                          

data/app/views/orders/_order_sidebar.html.haml

@@ -9,14 +9,27 @@
         - if order.assignable?
           %li
             = link_to "Assign Person", new_order_assignment_path(order)
-        %li
-          -if order.editable?
-            =link_to "Edit Donation", edit_contribution_path(order, :format => :html), :id => 'edit-order-link', "data-remote" => "true"
+        - if @order.donations.present? && !@order.is_fafs?
+          %li
+            =link_to "Edit Donation", edit_contribution_path(order, :format => :html), :id => 'edit-order-link'
         %li
           =link_to "Edit Order Notes", "#notes", 'data-toggle' => 'modal'
+        - if order.is_pledge
+          - if order.scheduled_pledge_payments.not_received.empty? && !order.fully_paid?
+            %li
+              =link_to "Receive Pledge Payment", "#receive-pledge_0", 'data-toggle' => 'modal'
+          %li
+            =link_to "Schedule Pledge Payment", edit_contribution_path(order, :format => :html), :id => 'edit-order-link'
+        - elsif order.parent.nil? && order.assignable_pledges.any?
+          %li
+            =link_to "Convert to Pledge Payment", "#assignable_pledges", 'data-toggle' => 'modal'
+
         %li
           -if order.destroyable?
             =link_to "Delete", "#confirm-delete", 'data-toggle' => 'modal'
+        %li
+          -if current_user.can?(:manage, Sale) && current_user.current_organization.has_kit?(:scannable_tickets) && @order.printable_tickets?
+            =link_to "Print Tickets", order_path(@order, :format => :pdf), :target => "_blank"
 
 %ul.kv
   %li
@@ -29,15 +42,24 @@
   %li
     %h6.key Ordered by
     .value=link_to_person person
+  - unless order.creator.nil?
+    %li
+      %h6.key Creator
+      .value= order.creator
+
   %li
     %h6.key Date
-    .value #{(l order.created_at_local_to_organization) unless order.created_at.nil?}
+    .value
+      -if pledge_commitment_date.nil?
+        #{(l order.created_at_local_to_organization) unless order.created_at.nil?}
+      -else
+        #{(l pledge_commitment_date)}
   %li
     %h6.key Amount
     .value #{number_as_cents(total)}
   - if order.nongift_amount > 0
     %li
-      %h6.key Non-deductible
+      %h6.key Nondeductible
       .value #{number_as_cents(order.nongift_amount)}
   %li
     %h6.key Payment method
@@ -55,10 +77,18 @@
   %li
     %h6.key-full Special Instructions
     .value= order.special_instructions
+  %li
+    %h6.key-full Donor Instructions
+    .value= order.donor_instructions
   %li#notes-display
     %h6.key-full Order Notes
     .value= order.notes
-    
+  - unless order.match_eligible_pledge.nil?
+    %li
+      %h6.key Received Match
+      .value=(order.match_eligible_pledge.fully_paid? ? "YES" : "NO")
+
+
 #edit-order-popup.modal
   
 -if order.destroyable?  
@@ -75,7 +105,7 @@
       %p Artful.ly cannot resend a receipt because this donation was made through Fractured Atlas.  We'll have this feature in place soon!  
     .modal-footer
       =link_to "OK", "#", :class => "btn", 'data-dismiss'=>'modal'
-       
+
   -elsif person.email.blank?
     .modal-body
       %p Artful.ly cannot email a receipt because we do not have an email address on file for this #{@person.type.downcase}.

data/app/views/orders/membership.html.haml

@@ -45,7 +45,7 @@
           %th Person
           %th Method
           %th Membership Type
-          %th Amount
+          %th.right Amount
       %tbody
         - @search.results.each do |order|
           - order.items.select(&:membership?).each_with_index do |item, index|
@@ -63,7 +63,7 @@
               %tr
                 %td 
                   ="#{item.product.membership_type.name}"
-                %td= number_as_cents item.price
+                %td.right= number_as_cents item.price
 
     = will_paginate(@search.results)
 

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

@@ -41,8 +41,8 @@
           %th Time
           %th Person
           %th Method
-          %th Membership Type
-          %th Amount
+          %th Pass Type
+          %th.right Amount
       %tbody
         - @search.results.each do |order|
           - order.items.select(&:pass?).each_with_index do |item, index|
@@ -55,12 +55,12 @@
                 %td{:rowspan => rowspan}= (order.payment_method || "")
                 %td 
                   ="#{item.product.pass_type.name}"
-                %td= number_as_cents item.price
+                %td.right= number_as_cents item.price
             - else
               %tr
                 %td 
                   ="#{item.product.pass_type.name}"
-                %td= number_as_cents item.price
+                %td.right= number_as_cents item.price
 
     = will_paginate(@search.results)
 

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

@@ -3,7 +3,7 @@
   %h1 Ticket Orders
 
 #donations-search
-  = form_tag sales_orders_path, :method => :get, :class => 'form-inline' do
+  = form_tag sales_orders_path, :method => :get, :class => 'form-inline', :id => 'sales-form' do
     .control-group.well
       .pull-left
         = label_tag :start, "From", :class => "control-label"
@@ -21,7 +21,7 @@
         
       .pull-right
         = submit_tag "Search", :class => "btn"
-        = submit_tag "Download", :class => "btn"
+        = submit_tag "Download", :class => "btn", :id => "download-button"
 
 - if @search.results.present?
 
@@ -34,7 +34,7 @@
           %th Person
           %th Method
           %th Event and Show
-          %th Amount
+          %th.right Amount
       %tbody
         - @search.results.each do |order|
           - order.items.select(&:ticket?).each_with_index do |item, index|
@@ -49,9 +49,9 @@
                 ="#{item.show.event.name}"
                 %br
                 ="#{l item.show.datetime_local_to_event}"
-              %td= number_as_cents item.price
+              %td.right= number_as_cents item.price
     = will_paginate(@search.results)
 
 - else
 
-  %h4= "No sales found."
+  %h4= "No sales found."   

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

@@ -4,21 +4,40 @@
 
 .row
   .span3
-    = render :partial => 'order_sidebar', :locals => { :order => @order, :person => @person, :total => @total }
+    = render :partial => 'order_sidebar', :locals => { :order => @order, :person => @person, :total => @total, :pledge_commitment_date => @order.pledge_commitment_date }
   .span9
     - unless @order.all_items.empty?
-      = render :partial => 'refunds/grouped_form', :locals => { :order => @order }
-      = render :partial => 'exchanges/grouped_form', :locals => { :order => @order }
-      = render :partial => 'returns/grouped_form', :locals => { :order => @order }
+      - if current_user.can? :manage, Order
+        = render :partial => 'refunds/grouped_form', :locals => { :order => @order }
+        = render :partial => 'exchanges/grouped_form', :locals => { :order => @order }
+        = render :partial => 'returns/grouped_form', :locals => { :order => @order }
+        - if current_user.current_organization.has_kit?(:regular_donation)
+          = render :partial => 'converts/grouped_form', :locals => { :order => @order }
+
+      = render :partial => 'item_table', :locals => { :order => @order, :is_child => false}
+
+      - if @order.is_pledge && (@order.scheduled_pledge_payments.any? || !@order.fully_paid?)
+        #pledges
+          .row-fluid
+            .span4
+              %h3 Scheduled Payments
+          - if @order.scheduled_pledge_payments.any?
+            = render :partial => 'pledges/scheduled_payments_table', :locals => {:scheduled_pledge_payments => @order.scheduled_pledge_payments}
+          - elsif !@order.fully_paid?
+            = render :partial => 'pledges/none_scheduled_payment_table', :locals => {:order_id => @order.id}
+
+      - if !@order.is_pledge && @order.parent.nil? && @order.assignable_pledges.any?
+        = render :partial => 'orders/assignable_pledges', :locals => {:order_id => @order.id}
+      - if @order.scheduled_pledge_payments.not_received.empty? && !@order.fully_paid?
+        = render :partial => 'pledges/receive_pledge', :locals => {:spp_id => 0, :order_id => @order.id, :person_id => @person.id, :amount => @order.outstanding_amount}
 
-      = render :partial => 'item_table', :locals => { :order => @order, :is_child => false }
 
 - unless @order.children.empty?
   - @order.children.each do |child|
     %hr
     .row
       .span3
-        = render :partial => 'order_sidebar', :locals => { :order => child, :person => @person, :total => child.total, :work_with => false }
+        = render :partial => 'order_sidebar', :locals => { :order => child, :person => child.person, :total => child.total, :work_with => false, :pledge_commitment_date => nil }
       .span9
         - unless child.items.empty?
-          = render :partial => 'item_table', :locals => { :order => child, :is_child => true }
+          = render :partial => 'item_table', :locals => { :order => child, :is_child => true}

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

@@ -18,8 +18,3 @@
   .control-group
     = form.label :time_zone, "Time Zone", :class => 'control-label'
     .controls= form.time_zone_select :time_zone, ActiveSupport::TimeZone.us_zones, {:default => "Eastern Time (US & Canada)"}, {:class => 'span5', :required => true}
-
-  .control-group
-    %label.controls.checkbox
-      = form.check_box :receive_daily_sales_report
-      Send me emails summarizing my sales for each day.

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

@@ -3,7 +3,8 @@
 
 .row.bottom-room
   .pull-right
-    =icon_link_to("New Pass Type", new_pass_type_path, 'fa-plus', 'btn','')
+    -if current_user.can? :manage, Membership
+      =icon_link_to("New Pass Type", new_pass_type_path, 'fa-plus', 'btn','')
     =link_to "Download CSV", pass_types_path(:format => "csv"), :class => "btn"
 
 %table.table#pass-types-table
@@ -18,10 +19,17 @@
     %th.right
   -@pass_types.each do |pass_type|
     %tr
-      %td=link_to pass_type.name, edit_pass_type_path(pass_type)
+      %td
+        -if current_user.can? :edit, Pass
+          =link_to pass_type.name, edit_pass_type_path(pass_type)
+        - else
+          =pass_type.name
       %td=l pass_type.starts_at, :format => :slashed_date
       %td=l pass_type.ends_at, :format => :slashed_date
-      %td.right=pass_type.sold.count
+      - if pass_type.advanced_search_segment.blank?
+        %td.right=pass_type.sold.count
+      - if pass_type.advanced_search_segment.present?
+        %td.right=link_to pass_type.sold.count, advanced_search_segment_path(pass_type.advanced_search_segment)
       %td.right=pass_type.tickets_allowed
       %td.right=number_as_cents pass_type.price
       %td.right
@@ -29,6 +37,6 @@
           %span.badge{:class => "#{'badge-success' if pass_type.on_sale?}"}="S"
 
       %td.right
-        -if pass_type.destroyable? 
+        -if pass_type.destroyable? && (current_user.can? :destroy, Pass)
           = link_to('Delete', pass_type_path(pass_type), :method => :delete, :class => "btn btn-mini btn-danger")
-        =icon_link_to("Store link", store_pass_path(current_user.current_organization.cached_slug, pass_type), 'fa-shopping-cart', 'btn btn-mini', '')
+        =icon_link_to("Store link", store_pass_path(current_user.current_organization.cached_slug, pass_type), 'fa-shopping-cart', 'btn btn-mini', '')