artfully_ose 1.2.0.beta.1 → 1.2.0.pre

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

@@ -27,12 +27,9 @@ Order confirmation
     -unless row.show.event.venue.street_as_string.blank?
       ="#{row.show.event.venue.street_as_string}" 
     -unless row.show.event.venue.city_state_zip_as_string.blank?  
-      ="#{row.show.event.venue.city_state_zip_as_string}"    
-
-    -row.ticket_type_hash.keys.each do |ticket_type|
-      -ticket_type.tickets.each do |ticket|
-        = "#{ticket.ticket_type.name}: $#{format("%.2f", (ticket.sold_price/100.0))}"
-      =ticket_type.description
+      ="#{row.show.event.venue.city_state_zip_as_string}"
+    - row.tickets.each do |ticket|
+      = "- #{ticket.ticket_type.name}: $#{format("%.2f", (ticket.price/100.0))}"
 
 
 

data/app/views/orders/_item_table.haml

@@ -10,41 +10,24 @@
         %tr
           %th.grouped-checkbox= check_box_tag :all, nil, false, :class => :checkall
           %th Item
-          %th Type
-          %th Event
-          %th Show Date
           %th Price Paid
-          %th Discount/Pass
-          %th Status
+          %th Discount
+          %th
       %tbody
         - order.all_items.each do |item|
           %tr{:id => "row_item_#{item.id}", :class => item.state}
             %td.grouped-checkbox= check_box_tag "item_#{item.id}", item.id, false, :disabled => true
-            %td
-              - if order.class == MembershipChange::Order
-                %span Membership Change
-              -elsif order.class == RefundOrder
-                %span Ticket Refund
-              -elsif order.class == ExchangeOrder
-                %span Ticket Exchange
-              -else
-                = item.product_type
             %td.item-description
               - if item.product_type.eql?("Ticket")
-                - unless item.product.ticket_type == nil
-                  %span=item.product.ticket_type.name
+                %span=(item.state.eql?("refund") ? "Refund for" : "Ticket to")
+                %span
+                  #{link_to "#{item.product.event.name}", event_path(item.product.event)},
+                  #{link_to "#{l item.product.datetime}", event_show_path(item.product.show.event, item.product.show)}
               - if item.product_type.eql?("Donation")
                 %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.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)
+              =item.discount.try(:code)
             %td.state
               -if (item.product_type.eql?('Ticket') && !item.purchased?)
-                = item.state.capitalize
-                          
+                = item.state.capitalize

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

@@ -2,7 +2,7 @@
 -if work_with
   %ul
     %li.dropdown{:id => "#menu#bulkactions"}
-      =icon_link_to('Work with...', "#menu#bulkactions", 'fa-asterisk', 'dropdown-toggle dropdown btn', '')
+      =icon_link_to('Work with...', "#menu#bulkactions", 'icon-asterisk', 'dropdown-toggle dropdown btn', '')
       %ul.dropdown-menu
         %li
           =link_to "Send Receipt", "#receipt", 'data-toggle' => 'modal'
@@ -54,9 +54,11 @@
     .value= order.details
   %li
     %h6.key-full Special Instructions
+  %li
     .value= order.special_instructions
-  %li#notes-display
+  %li
     %h6.key-full Order Notes
+  %li
     .value= order.notes
     
 #edit-order-popup.modal

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

@@ -1,16 +1,16 @@
 - in_section :transactions
 - content_for :header do
-  %h1 Ticket Orders
+  %h1 Sales
 
 #donations-search
   = form_tag sales_orders_path, :method => :get, :class => 'form-inline' do
     .control-group.well
       .pull-left
         = label_tag :start, "From", :class => "control-label"
-        = text_field_tag :start,"#{l @search.start, :format => :date_for_input}", :class => 'datepicker input-small'
+        = text_field_tag :start,"#{l @search.start, :format => :date_for_input}", :readonly => true, :class => 'datepicker input-small'
 
         = label_tag :stop, "To", :class => "control-label"
-        = text_field_tag :stop, "#{l @search.stop, :format => :date_for_input}", :class => 'datepicker input-small'
+        = text_field_tag :stop, "#{l @search.stop, :format => :date_for_input}", :readonly => true, :class => 'datepicker input-small'
 
         - if @events.present?
           = label_tag :event_id, nil, :class => "control-label"

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

@@ -16,6 +16,6 @@
           = form.text_field :username
         %li
           =form.label :password, "Password", :class=>'control-label'
-          =form.password_field :password, autocomplete: 'off'
+          =form.password_field :password
     .modal-footer
       = form.submit "Connect", :class => 'btn'

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

@@ -1,25 +1,20 @@
-%fieldset
-  .control-group
-    = form.label :name, "Organization Name", :class => 'control-label'
-    .controls
-      = form.text_field :name, :value => @organization.name, :required => true, :class => 'input-xlarge no-fa'
-
-  .control-group
-    = form.label :email, 'Organization Email', :class=>'control-label'
-    .controls
-      = form.email_field :email, :placeholder => 'contact@organization.org', :required => true, :class => 'input-xlarge email-popup', "data-content" => "Your patrons will be able to respond to this email address when receiving ticket/donation receipts. You can change this at any time."
-      %span.help-inline (default contact for your patrons)
-
-  .control-group
-    = form.label :cached_slug, 'Storefront URL', :class=>'control-label'
-    .controls
-      = form.text_field :cached_slug, :placeholder => @organization.cached_slug, :required => true, :class => 'input-xlarge'
-
-  .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.
+.row-fluid
+  .span6
+    %h3 Details
+    %ul
+      %li
+        =form.label :name, "Organization Name"
+        =form.text_field :name, :class => 'input-xlarge no-fa'
+      %li
+        =form.label :email, "Contact Email"
+        =form.email_field :email, :class => 'input-xlarge email-popup', "data-content" => "Your patrons will be able to respond to this email address when receiving ticket/donation receipts. You can change this at any time."
+      %li
+        =form.label :time_zone, "Time Zone"
+        =form.time_zone_select( :time_zone, ActiveSupport::TimeZone.us_zones, {:default => "Eastern Time (US & Canada)"}, {:class => 'input-xlarge'})
+  .span6
+    %h3 Preferences
+    %ul
+      %li
+        %label.checkbox
+          = form.check_box :receive_daily_sales_report
+          Send the organization admin a daily sales report.

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

@@ -3,6 +3,6 @@
   %h1 Edit Organization
 
 = render "shared/error_messages", :target => @organization
-= form_for @organization, :html => {"ng-controller" => "EditOrganizationCtrl"} do |form|
+= form_for @organization do |form|
   = render :partial => 'organizations/form', :locals => { :form => form }
-  = form.submit "Save", :class => 'btn btn-primary disablable'
+  = form.submit "Save", :class => 'btn btn-primary disablable'

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

@@ -2,26 +2,20 @@
 - content_for :header do
   %h1 Account Administration
 
-.bottom-room.bordered-section
-  .row
-    .span3
-      %h3{:style => "margin-top: 0px"} Details
-      - if can? :manage, current_user.current_organization
-        = link_to "Edit", edit_organization_path(@organization), {:class => "btn"}
-    .span9
-      %ul.kv
-        %li.row-fluid
-          .key.span3 Organization Name
-          .value.span9= @organization.name
-        %li.row-fluid
-          .key.span3 Email
-          .value.span9= @organization.email
-        %li.row-fluid
-          .key.span3 Time Zone
-          .value.span9= @organization.time_zone
+%ul.kv
+  %li.row-fluid
+    .key.span2 Organization Name
+    .value.span6= @organization.name
+  %li.row-fluid
+    .key.span2 Email
+    .value.span6= @organization.email
+  %li.row-fluid
+    .key.span2 Time Zone
+    .value.span6= @organization.time_zone
+    
+- if can? :manage, current_user.current_organization
+  = link_to "Edit", edit_organization_path(@organization), {:class => "btn"}
 
-.bottom-room.bordered-section
-  = render :partial => "kits/list", :locals => { :organization => @organization }
-
-.bottom-room.bordered-section
-  = render :partial => "user_memberships/list", :locals => { :organization => @organization }
+#organization-details.row
+  #memberships.span12
+    = render :partial => "user_memberships/list", :locals => { :organization => @organization }

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

@@ -1,13 +1,10 @@
--# This modal is used in both person editing and member editing
-
-- except    ||= {}
+- except ||= {}
 - return_to ||= nil
-- url       ||= person_path(@person)
 #edit-person.modal
   .modal-header
     = link_to '×'.html_safe, '#', :class => 'close', 'data-dismiss' => 'modal'
     %h3=header
-  = form_for(@person, :url => url, :html => {:class => 'form-horizontal'}) do |form|
+  = form_for(@person, :html => {:class => 'form-horizontal'}) do |form|
     =hidden_field_tag :return_to, return_to unless return_to.blank?
     .modal-body
       .row
@@ -17,14 +14,11 @@
             %li.tab= link_to 'Address', '#address', 'data-toggle' => 'tab' unless except.include? :address
             %li.tab= link_to 'Phone', '#phone', 'data-toggle' => 'tab' unless except.include? :phone
             %li.tab= link_to 'Social Media', '#social-media', 'data-toggle' => 'tab' unless except.include? :social
-            -with_kit(:relationships) do
-              %li.tab-relationships= link_to 'Relationships', '#relationships' unless except.include? :relationships
-            -with_kit(:relationships) do
-              - if @person.individual?
-                %li.tab-households= link_to 'Households', '#households' unless except.include? :households
+            %li.tab-merge= link_to 'Merge', '#merge' unless except.include? :merge
+            %li.tab-delete= link_to 'Delete', '#delete' unless except.include? :delete
         .span7
           .tab-content
-            - unless except.include? :basics
+            - unless except.include? :basics 
               #basics.tab-pane.active
                 - if @person.company?
                   .controls
@@ -60,16 +54,9 @@
                 .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?
+                - if @person.individual?
                   .controls
-                    - unless except.include? :convert
+                    - unless except.include? :convert 
                       = link_to "Convert to Company", '#convert-to-company', 'data-toggle' => 'modal'
 
             - unless except.include? :address
@@ -99,7 +86,7 @@
                     = address_form.label :zip, "Zip / Postal Code", :class => 'control-label'
                     .control
                       = address_form.text_field :zip
-
+            
             - unless except.include? :phone
               #phone.tab-pane
                 - @person.phones.build if @person.phones.empty?
@@ -109,7 +96,7 @@
                 .control-group
                   %label.control-label
                   .controls
-                    %i.fa.fa-plus-circle.icon-gray
+                    %i.icon-plus-sign.icon-gray
                     = link_to_add_fields 'Add another number', form, :phones, "people"
 
             - unless except.include? :social
@@ -138,28 +125,24 @@
                     .input-prepend
                       %span.add-on http://linkedin.com/in/
                       = form.text_field :linked_in_url
+            
+            - unless except.include? :merge
+              #merge.tab-pane
+                %p
+                  Combine all notes, actions, phone numbers, and tags with another #{@person.type.downcase}.
+                = link_to "Select Master #{@person.type} Record", new_merge_path(:loser => @person), :method => :get, :class => "btn btn-warning"
 
-            - unless except.include? :relationships
-              #relationships.tab-pane
-                - @person.relationships.build
-                = form.fields_for :relationships do |relationship_form|
-                  = render "relationship_fields", :f => relationship_form
-
-                .control-group
-                  %label.control-label
-                  .controls
-                    %i.fa.fa-plus-cirlce.icon-gray
-                    = link_to_add_fields 'Add another relationship', form, :relationships
-
-            - unless except.include? :households
-              - if @person.individual?
-                #households.tab-pane
-                  - if @person.household
-                    %p
-                      == #{@person} is a member of the #{link_to @person.household.name, @person.household} household
-                  - else
-                    %p
-                      = link_to "Add to new household", new_household_url(:individuals => [@person.id]), :class => "btn"
+            - unless except.include? :delete
+              #delete.tab-pane
+                - if @person.destroyable?
+                  %p
+                    Delete
+                    = @person
+                    from Artful.ly.
+                  = link_to "Delete", @person, :method => :delete, :class => "btn btn-danger delete-person", :confirm => "Are you sure you want to delete #{@person}?"
+                - else
+                  %p
+                    This person has actions or orders, so we're unable to delete this person at this time.
 
     .modal-footer
       = form.submit 'Save', :class => 'btn btn-primary save-person'
@@ -170,13 +153,10 @@
   // change modal based on tab
   :javascript
     $(document).ready(function() {
-      $('.tab-relationships a').click(function (e) {
-        e.preventDefault();
-        $(this).tab('show');
-      })
-      $('.tab-households a').click(function (e) {
+      $('.tab-merge a, .tab-delete a').click(function (e) {
         e.preventDefault();
         $(this).tab('show');
+        $('#edit-person .save-person').hide();
       })
       $('.tab a').click(function (e) {
         e.preventDefault();

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

@@ -1,31 +1,24 @@
 .row
   .span12
     .person-header
-      .span2
-        .person-avatar.row
-          = person_avatar_with_fallback(@person, 150)
+      .person-avatar
+        = person_avatar_with_fallback(@person, 150)
 
       .person-values-and-tags
         %ul.person-values
-          %li#ticket-value
+          %li
             %h3= number_as_cents(@person.lifetime_ticket_value)
             %h6= pluralize(@person.tickets.length, 'tickets')
-          %li#donation-value
+          %li
             %h3= number_as_cents(@person.lifetime_donations)
-            %h6= pluralize(Item.donations_by(@person).count, 'donation')
-          - with_kit(:membership) do
-            %li#membership-value
-              %h3=number_as_cents(@person.lifetime_memberships)
-              %h6=pluralize(@person.memberships.size, 'membership')
-          %li#lifetime-value
+            %h6= pluralize(@person.orders.collect(&:donations).flatten.length, 'donation')
+          %li
             %h3= number_as_cents(@person.lifetime_value)
             %h6 lifetime
 
-        %ul.detailed-list.tags#badges
-          -unless @person.member.nil?
-            %li.tag.rounder.tag-member= link_to "Member", person_memberships_path(@person), :style => "color:white"
-          -if @person.any_current_passes?
-            %li.tag.rounder.tag-passholder= link_to "Passholder", person_passes_path(@person), :style => "color:white"
+        -unless @person.member.nil?
+          %ul.detailed-list.tags
+            %li.tag.rounder{:style => "background-color: #175c71"}= link_to "Member", person_memberships_path(@person), :style => "color:white"
 
         .person-tags
           = render :partial=>'shared/tags', :locals => { :tags => @person.tag_list, :subject => @person }
@@ -38,8 +31,6 @@
       %ul.person-links
         -if @person.email.present?
           %li= mail_to @person.email, @person.email, :class => 'email'
-        -if @person.website.present?
-          %li= link_to @person.website, full_url(@person.website), :target => :blank, :class => 'website' 
         -if @person.twitter_handle.present?
           %li= link_to @person.twitter_handle, full_url(@person.twitter_handle, 'http://twitter.com/'), :class => 'twitter'
         -if @person.facebook_url.present?

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

@@ -6,5 +6,5 @@
       = f.text_field :number, :placeholder => "555-123-1234", :class => 'input-medium'
       %span.remove-fields-link
         = f.hidden_field :_destroy
-        %i.fa.fa-minus-circle.icon-gray
+        %i.icon-minus-sign.icon-gray
         = link_to_remove_fields "remove", f

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

@@ -6,31 +6,19 @@
 
 .row
   .span4
-    = form_tag people_path, {:method => :get, :class => 'super-search form-search'} do
+    = form_tag people_path, {:method => :get, :remote => true, :class => 'super-search form-search'} do
       = hidden_field_tag :commit, "Search"
       %ul
         %li
-          = text_field_tag :search, params[:search], :placeholder => "Email, name, or tag...", :class => "input-medium search-query"
+          = text_field_tag :search, "", :placeholder => "Email, name, or tag...", :class => "input-medium search-query"
       .control
         = submit_tag "Search", :class => 'btn'
         = link_to "Advanced Search", new_search_path
   .span8.super-search-results
-
     - if @people.empty?
        
-    -else    
-      - if @show_advanced_search_message 
-        .well
-          .row-fluid
-            .span2
-              .center
-                =icon_tag '06-magnify@2x'
-            .span10
-              %strong
-                Looks like you've got a lot of results here so we only returned the top 40. 
-                %br
-                Try 
-                =link_to "Advanced Search", new_search_path 
-                for more refined searching and results.
+    -else
       = render :partial => 'list', :locals => { :people => @people } unless @people.empty?
-      = will_paginate @people, :inner_window => 2, :outer_window => 0
+      = will_paginate @people, :inner_window => 2, :outer_window => 0
+
+

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

@@ -7,4 +7,4 @@
 .row{"ng-controller" => "NewPersonCtrl"}
   .span6.offset3
     = render :partial => "shared/error_messages", :locals => { :target => @person }
-    = render :partial => 'form', :locals => { :person => @person }
+    = render :partial => 'form', :locals => { :person => @person }