artfully_ose 1.1.0 → 1.2.0.alpha.1

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

@@ -0,0 +1,27 @@
+#items
+  %table.zebra.table
+    %thead
+      %tr
+        %th.grouped-checkbox= check_box_tag :all, nil, false, :class => :checkall
+        %th Item
+        %th Price Paid
+        %th Discount
+        %th
+    %tbody
+      - order.tickets.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.item-description
+            - if item.product_type.eql?("Ticket")
+              %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
+          %td.price= amount_and_nongift item
+          %td
+            =item.discount.try(:code)
+          %td.state
+            -if (item.product_type.eql?('Ticket') && !item.purchased?)
+              = item.state.capitalize

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

@@ -1,14 +1,22 @@
-.btn-group.bottom-room
-  =icon_link_to("Receipt", "#receipt", 'icon-envelope', 'btn', '', {'data-toggle' => 'modal'})
-  -if order.editable?
-    =link_to "Edit", edit_contribution_path(order, :format => :html), :class => 'btn', :id => 'edit-order-link', "data-remote" => "true"
-  -else
-    =link_to "Edit", "#", :class => 'btn disabled edit-message'
-    
-  -if order.destroyable?
-    =link_to "Delete", "#confirm-delete", :class => 'btn', 'data-toggle' => 'modal'
-  -else
-    =link_to "Delete", "#", :class => 'btn disabled delete-message'
+-work_with = true if work_with.nil?
+-if work_with
+  %ul
+    %li.dropdown{:id => "#menu#bulkactions"}
+      =icon_link_to('Work with...', "#menu#bulkactions", 'fa-asterisk', 'dropdown-toggle dropdown btn', '')
+      %ul.dropdown-menu
+        %li
+          =link_to "Send Receipt", "#receipt", 'data-toggle' => 'modal'
+        - 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"
+        %li
+          =link_to "Edit Order Notes", "#notes", 'data-toggle' => 'modal'
+        %li
+          -if order.destroyable?
+            =link_to "Delete", "#confirm-delete", 'data-toggle' => 'modal'
 
 %ul.kv
   %li
@@ -43,18 +51,20 @@
       .value=order.fa_id
   %li
     %h6.key Details
-    .value #{order.details}
+    .value= order.details
   %li
     %h6.key-full Special Instructions
-  %li
-    .value #{order.special_instructions}
+    .value= order.special_instructions
+  %li#notes-display
+    %h6.key-full Order Notes
+    .value= order.notes
     
 #edit-order-popup.modal
   
 -if order.destroyable?  
   #confirm-delete.modal
     .modal-body
-      Are you sure you want to delete this order?  The order and associated actions will be deleted.  This cannot be undone.  The person record will not be deleted.
+      Are you sure you want to delete this order?  The order and associated actions will be deleted.  This cannot be undone.  The #{@person.type.downcase} record will not be deleted.
     .modal-footer
       =link_to "Delete", contribution_path(order), :class => 'btn btn-danger', :id => 'destroy-order-link', 'data-method' => :delete
       =link_to "Cancel", "#", :class => "btn", 'data-dismiss'=>'modal'  
@@ -68,9 +78,9 @@
        
   -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.  
+      %p Artful.ly cannot email a receipt because we do not have an email address on file for this #{@person.type.downcase}.
       %p
-        =link_to "Update the person record", person_path(@person) 
+        =link_to "Update the #{@person.type.downcase} record", person_path(@person)
         to add an email, then try again.
     .modal-footer
       =link_to "OK", "#", :class => "btn", 'data-dismiss'=>'modal' 
@@ -81,4 +91,16 @@
       %strong="#{person.email}"
     .modal-footer
       =link_to "Resend Receipt", resend_order_path(order), :class => "btn btn-success"
-      =link_to "Cancel", "#", :class => "btn btn-danger", 'data-dismiss'=>'modal'   
+      =link_to "Cancel", "#", :class => "btn btn-danger", 'data-dismiss'=>'modal'
+
+
+#notes.modal
+  .modal-header
+    .close{'data-dismiss'=>'modal'} x
+    %h3 Edit Order Notes
+  = form_tag order_url(order), :method => :put do
+    .modal-body
+      = text_area_tag "order[notes]", order.notes, :rows => "5", :class => "block"
+    .modal-footer
+      = submit_tag "Save", :class => "btn btn-success"
+      = link_to "Cancel", "#", :class => "btn", 'data-dismiss'=>'modal'

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

@@ -6,6 +6,8 @@
   = form_tag orders_path, {:method => :get, :class => 'super-search form-search'} do
     = text_field_tag :search, "", :placeholder => "Enter a patron name, event, or order number...", :class => "span6"
     = submit_tag "Search", :class => "btn"
+    - if !params["search"].nil?
+      = submit_tag "Download", :class => "btn"
 
 #orders-table
   - if !params["search"].nil? && @results.empty?

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

@@ -0,0 +1,104 @@
+- in_section :transactions
+- content_for :header do
+  %h1 Membership Orders
+
+#print-cards.modal.hide.fade
+  .modal-header
+    .close{'data-dismiss'=>'modal'} x
+    %h3 Generating Member Cards
+  .modal-body
+    %p
+      A PDF is being generated and will automatically begin downloading when ready...
+    .progress.progress-success.progress-striped.active
+      .bar{:style => 'width: 90%'}
+
+#donations-search
+
+  .control-group.well
+    = form_tag membership_orders_path, :method => :get, :class => 'form-inline' do
+      .pull-left
+        = label_tag :start, "From", :class => "control-label"
+        = 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}", :readonly => true, :class => 'datepicker input-small'
+
+        - if @membership_types.present?
+          = label_tag :membership_type_id, nil, :class => "control-label"
+          = raw select_membership_type_for_sales_search @membership_types, :membership_type_id, params[:membership_type_id]
+
+        = submit_tag "Search", :class => "btn"
+
+
+      - if @search.results.present?
+        .pull-right
+
+          %ul.in-table
+            %li.dropdown#bulkactions
+              =icon_link_to('Work with...', "#menu#bulkactions", 'fa-asterisk', 'dropdown-toggle dropdown btn', '')
+              %ul.dropdown-menu
+                %li
+                  = link_to 'Export to CSV', params.merge(:format => 'csv').delete_if {|k,v| :commit == k.to_sym }
+                - with_kit(:membership) do
+                  %li
+                    =link_to 'Print Member Cards', new_member_card_path({:start => @search.start, :stop => @search.stop, :membership_type_id => @search.membership_type.try(:id)}), :onclick => "$('#print-cards').modal();"
+
+
+- if @search.results.present?
+
+  #tickets
+    %table.standalone.zebra.table
+      %thead
+        %tr
+          %th Order
+          %th Time
+          %th Person
+          %th Method
+          %th Membership Type
+          %th Amount
+      %tbody
+        - @search.results.each do |order|
+          - order.items.select(&:membership?).each_with_index do |item, index|
+            %tr
+              - if index == 0
+                - rowspan = order.items.select(&:membership?).size
+                %td{:rowspan => rowspan}= link_to order.id, order_path(order.id)
+                %td{:rowspan => rowspan}= l(order.created_at_local_to_organization, :format => :short)
+                %td{:rowspan => rowspan}= link_to_person(order.person)
+                %td{:rowspan => rowspan}= (order.payment_method || "")
+              %td 
+                ="#{item.product.membership_type.name}"
+              %td= number_as_cents item.price
+    = will_paginate(@search.results)
+
+- else
+
+  %h4= "No sales found."
+
+- content_for :custom_js do
+  :javascript
+    var printCardInterval;
+
+    $('#print-cards').on('show', function (show) {
+      // Remove any existing intervals
+      clearInterval(printCardInterval);
+
+      // Initial hurry to 90%
+      var bar = $('#print-cards .bar');
+      $(bar).css('width', '1%').animate({width: '90%'}, 1500, function() {
+
+          // Progress to 100% from there
+          var times = 0;
+          printCardInterval = setInterval(function() {
+            // Count this run
+            times = times + 1;
+
+            // Update the progress bar
+            $(bar).css('width', (90 + times) + '%');
+
+            // Clear the interval on the last run
+            if (times > 9) { clearInterval(printCardInterval); }
+          }, 1000);
+
+      });
+    });

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

@@ -1,25 +1,27 @@
 - in_section :transactions
 - content_for :header do
-  %h1 Sales
+  %h1 Ticket Orders
 
 #donations-search
   = form_tag sales_orders_path, :method => :get, :class => 'form-inline' do
     .control-group.well
-      = label_tag :start, "From", :class => "control-label"
-      = text_field_tag :start,"#{l @search.start, :format => :date_for_input}", :readonly => true, :class => 'datepicker input-small'
+      .pull-left
+        = label_tag :start, "From", :class => "control-label"
+        = 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}", :readonly => true, :class => 'datepicker input-small'
+        = label_tag :stop, "To", :class => "control-label"
+        = 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"
-        = raw select_event_for_sales_search @events, :event_id, params[:event_id]
-      - if @event && @shows.present?
-        = label_tag :show_id, nil, :class => "control-label"
-        = raw select_show_for_sales_search @shows, :show_id, params[:show_id]
+        - if @events.present?
+          = label_tag :event_id, nil, :class => "control-label"
+          = raw select_event_for_sales_search @events, :event_id, params[:event_id]
+        - if @event && @shows.present?
+          = label_tag :show_id, nil, :class => "control-label"
+          = raw select_show_for_sales_search @shows, :show_id, params[:show_id]
         
       .pull-right
         = submit_tag "Search", :class => "btn"
+        = submit_tag "Download", :class => "btn"
 
 - if @search.results.present?
 
@@ -44,9 +46,9 @@
                 %td{:rowspan => rowspan}= link_to_person(order.person)
                 %td{:rowspan => rowspan}= (order.payment_method || "")
               %td 
-                ="#{item.product.event.name}"
+                ="#{item.show.event.name}"
                 %br
-                ="#{l item.product.show.datetime_local_to_event}"
+                ="#{l item.show.datetime_local_to_event}"
               %td= number_as_cents item.price
     = will_paginate(@search.results)
 

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

@@ -11,14 +11,14 @@
       = render :partial => 'exchanges/grouped_form', :locals => { :order => @order }
       = render :partial => 'returns/grouped_form', :locals => { :order => @order }
 
-      = render :partial => 'item_table', :locals => { :order => @order }
+      = 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 }
+        = render :partial => 'order_sidebar', :locals => { :order => child, :person => @person, :total => child.total, :work_with => false }
       .span9
         - unless child.items.empty?
-          = render :partial => 'item_table', :locals => { :order => child }
+          = render :partial => 'item_table', :locals => { :order => child, :is_child => true }

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
+          =form.password_field :password, autocomplete: 'off'
     .modal-footer
       = form.submit "Connect", :class => 'btn'

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

@@ -1,20 +1,25 @@
-.row-fluid
-  .span6
-    %h3 Details
-    %ul
-      %li
-        =form.label :name, "Organization Name"
-        =form.text_field :name, :class => 'input-xlarge'
-      %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.
+%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.

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

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

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

@@ -13,4 +13,4 @@
     = render "shared/error_messages", :target => @organization
     = form_for @organization do |form|
       %ul= render :partial => 'organizations/form', :locals => { :form => form }
-      = form.submit "Create", :class => "btn"
+      = form.submit "Save", :class => "btn btn-primary single-shot disablable"

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

@@ -2,20 +2,26 @@
 - content_for :header do
   %h1 Account Administration
 
-%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
+  .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
 
-#organization-details.row
-  #memberships.span12
-    = render :partial => "memberships/list", :locals => { :organization => @organization }
+.bottom-room.bordered-section
+  = render :partial => "kits/list", :locals => { :organization => @organization }
+
+.bottom-room.bordered-section
+  = render :partial => "user_memberships/list", :locals => { :organization => @organization }

data/app/views/pass_mailer/pass_info_for.html.haml

@@ -0,0 +1,21 @@
+%p="Hello #{@person}!"
+
+%p
+  To use your pass, go to our storefront here #{link_to store_organization_events_url(@pass_summary.organization.cached_slug), store_organization_events_url(@pass_summary.organization.cached_slug)}. Add some tickets to your cart, then enter your pass code.
+
+- @pass_summary.rows.each do |pass_type, passes|
+  %p
+    =pass_type.email_copy
+  .passes-container{:style => "text-align: -webkit-center;"}
+    .passes-display{:style => "width: 400px;font-weight: bold;padding: 20px;color: #185969"}
+      .pass=pass_type.name
+      - passes.each do |pass|
+        .pass-container{:style => 'margin-bottom:20px'}
+          .pass=pass.pass_code
+          .details{:style => "font-weight: normal; font-size: 12pt;"}
+            %em="#{pluralize(pass.tickets_allowed,"ticket credit")}, #{pass.tickets_allowed - pass.tickets_purchased} remaining"
+
+%p
+  If you have questions, please contact us at #{@pass_summary.organization.email}
+
+%p Thanks!

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

@@ -0,0 +1,76 @@
+=form_for @pass_type, :as => :pass_type, :html => { :class => 'form-horizontal' } do |f|
+
+  %fieldset
+    %legend Basics
+    .control-group
+      = f.label :name, "Name", :class => 'control-label'
+      .controls
+        = f.text_field :name, :class => 'input span6'
+    .control-group
+      = f.label :description, "Description", :class => 'control-label'
+      .controls
+        = f.text_area :description, :rows => "5", :class => "span6"
+
+    .control-group
+      = f.label :starts_at, "Pass Starts", :class => 'control-label'
+      .controls
+        = f.text_field :starts_at, :value => "#{(l @pass_type.starts_at, :format => :date_for_input) unless @pass_type.starts_at.nil?}", :class => :datepicker
+    .control-group
+      = f.label :ends_at, "Pass Ends", :class => 'control-label'
+      .controls
+        = f.text_field :ends_at, :value => "#{(l @pass_type.ends_at, :format => :date_for_input) unless @pass_type.ends_at.nil?}", :class => :datepicker
+
+  %fieldset
+    %legend Pricing
+    .control-group
+      = f.label :tickets_allowed, "Number of Tickets", :class => 'control-label'
+      .controls
+        = f.text_field :tickets_allowed, :class => 'span2'
+    .control-group
+      = f.label :price, "Price", :class => 'control-label'
+      .controls
+        = f.text_field :price, :class => 'span2 section-price currency'
+
+    =render :partial => "pass_types/pass_type_fees", :locals => {:f => f}
+
+  %fieldset
+    %legend Storefront Copy
+    .control-group
+      = f.label :thanks_copy, :class => 'control-label' do
+        Thanks Message
+        .tip.muted Thanks message will appear on the confirmation page after the patron completes purchase of the pass.
+      .controls
+        = f.text_area :thanks_copy, :rows => "5", :class => "span6"
+    .control-group
+      = f.label :email_copy, :class => 'control-label' do
+        Email Message
+        .tip.muted Email message will be included in the patron's pass details email.
+      .controls
+        = f.text_area :email_copy, :rows => "5", :class => "span6"
+
+  %fieldset
+    %legend Sales
+    .control-group
+      = f.label :fee, "Sales Start", :class => 'control-label'
+      .controls
+        = f.text_field :sales_start_at, :value => "#{(l @pass_type.sales_start_at, :format => :date_for_input) unless @pass_type.sales_start_at.nil?}", :class => :datepicker
+    .control-group
+      = f.label :fee, "Sales End", :class => 'control-label'
+      .controls
+        = f.text_field :sales_end_at, :value => "#{(l @pass_type.sales_end_at, :format => :date_for_input)  unless @pass_type.sales_end_at.nil?}", :class => :datepicker
+
+    .control-group
+      = f.label :on_sale, :class => 'control-label' do
+        Show On Storefront
+        .tip.muted If checked, this will be available on your
+        =link_to "Pass Storefront", store_passes_path(current_user.current_organization.cached_slug), :target => "_blank"
+      .controls
+        %label
+          = f.check_box :on_sale
+    .form-actions
+      =f.submit "Save", :class => "btn btn-primary"
+      =link_to "Cancel", pass_types_path, :class => "btn"
+
+-content_for :custom_js do
+  :javascript
+    $(document).ready(function() { touchCurrency(); })