artfully_ose 1.2.0.pre.4 → 1.2.0.pre.5

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

@@ -10,7 +10,7 @@
             = person.email
   .span8
     %h3 Membership
-    =form_for @membership_award do |form| 
+    =form_for @membership_award, :html => { :class => 'form-horizontal' } do |form| 
       .control-group
         = form.label "Membership Type", :class => 'control-label'
         .controls
@@ -20,18 +20,23 @@
         = form.label "Number of Memberships", :class => 'control-label'
         .controls
           = form.text_field :number_of_memberships
-      
+          
       .control-group
-        = form.label "Paid Per Membership", :class => 'control-label'
+        = form.label "Notes", :class => 'control-label'
         .controls
-          .input-prepend
-            %span.add-on $
-            = form.text_field :sold_price, :class => 'span1'
+          = form.text_area :notes, :rows => 2, :class => "span3"
           
       .control-group
         = form.label "Expires On", :class => 'control-label'
         .controls
           = form.text_field :ends_at, :class => :datepicker
+      
+      .control-group
+        = form.label "Price per membership", :class => 'control-label'
+        .controls
+          .input-prepend
+            %span.add-on $
+            = form.text_field :sold_price, :class => 'span1'
 
       .control-group
         .controls
@@ -44,7 +49,7 @@
 
       .control-group
         .controls
-          = form.text_area :message, :rows => 10, :class => "span6"
+          = form.text_area :message, :rows => 5, :class => "span5"
 
 
       .form-actions

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

@@ -19,7 +19,9 @@
               %li
                 = link_to "Change Expiration", "#extend", 'data-toggle' => 'modal'
               %li
-                = link_to "Cancel", "#cancel", 'data-toggle' => 'modal'
+                = link_to "Change Membership", "#change", 'data-toggle' => 'modal'
+              %li
+                = link_to "Cancel Membership", "#cancel", 'data-toggle' => 'modal'
       .span6.right
         = icon_link_to("View Record", person_path(@person), 'icon-share-alt', 'btn', '')
         = link_to "Log In", "#", 'data-toggle' => 'modal', :class => 'btn'
@@ -46,49 +48,107 @@
                 %td.price.right=number_as_cents membership.sold_price
                 %td.fee.right TODO
 
-      #full-refund.modal
-        .modal-header
-          .close{'data-dismiss'=>'modal'} x
-          %h3 Refund Membership
-        .modal-body
-          %p="#{@person} will receive a full refund for these memberships"  
-        .modal-footer
-          =link_to "Process Refund", "#", :class => "btn btn-success", 'data-dismiss'=>'modal'
-          =link_to "Cancel", "#", :class => "btn btn-danger", 'data-dismiss'=>'modal' 
+    #full-refund.modal
+      .modal-header
+        .close{'data-dismiss'=>'modal'} x
+        %h3 Refund Membership
+      .modal-body
+        %p="#{@person} will receive a full refund for these memberships"  
+      .modal-footer
+        =link_to "Process Refund", "#", :class => "btn btn-success", 'data-dismiss'=>'modal'
+        =link_to "Cancel", "#", :class => "btn btn-danger", 'data-dismiss'=>'modal' 
 
-      #partial-refund.modal
+    #change.modal
+      =form_tag "#", :class => "form-horizontal", :method => :post do
         .modal-header
           .close{'data-dismiss'=>'modal'} x
-          %h3 Refund Membership
+          %h3 Change Membership
         .modal-body
           .control-group
-            %label Enter refund amount:
+            %label.control-label="Membership Type"
             .controls
-              =text_field_tag "whatever", "", :class => "currency"
-          %p="#{@person} will receive a partial refund for the above amount and these memberships will be cancelled."  
-        .modal-footer
-          =link_to "Process Refund", "#", :class => "btn btn-success", 'data-dismiss'=>'modal'
-          =link_to "Cancel", "#", :class => "btn btn-danger", 'data-dismiss'=>'modal'
+              = select_tag :membership_type, options_from_collection_for_select(@membership_types, 'id', 'name')
 
-      #cancel.modal
-        .modal-header
-          .close{'data-dismiss'=>'modal'} x
-          %h3 Cancel Membership
-        .modal-body
-          %p="These memberships will be cancelled."  
-        .modal-footer
-          =link_to "Cancel Memberhships", "#", :class => "btn btn-success", 'data-dismiss'=>'modal'
-          =link_to "Cancel", "#", :class => "btn btn-danger", 'data-dismiss'=>'modal'
-
-      #extend.modal
-        .modal-header
-          .close{'data-dismiss'=>'modal'} x
-          %h3 Change Expiration
-        .modal-body
           .control-group
-            %label Change the expiration of these memberships to:
+            %label.control-label Price per membership
             .controls
-              =text_field_tag "ends_at", "", :class => "datepicker"
-        .modal-footer
-          =submit_tag "Change Expiration", :class => "btn btn-success"
-          =link_to "Cancel", "#", :class => "btn btn-danger", 'data-dismiss'=>'modal' 
+              .input-prepend
+                %span.add-on $
+                = text_field_tag :sold_price, "", :class => 'span1'
+
+          #payment-controls.controls
+            %label.radio
+              = radio_button_tag(:payment_method, :cash, true, :class => 'payment-method', :humanized_value => 'Cash')
+              Cash
+            %label.radio
+              = radio_button_tag(:payment_method, :comp, false, :class => 'payment-method', :humanized_value => 'Comp')
+              Comp
+            %label.radio
+              = radio_button_tag(:payment_method, :credit_card_manual, false, :class => 'payment-method', :humanized_value => 'Credit card')
+              Credit
+
+          #payment-info.hidden.well
+            .control-group
+              %label.control-label="Name on Card"
+              .controls= text_field_tag("credit_card[name]", params[:cardholder_name])
+            .control-group
+              %label.control-label="Card Number"
+              .controls= text_field_tag("credit_card[number]", params[:card_number])
+            .control-group
+              %label.control-label="Expiration Date"
+              .date_field.controls
+                = select_tag("credit_card[month]", options_for_select(1..12, params["month"]), :class => 'input-small inline')
+                = select_tag("credit_card[year]", options_for_select(Time.now.year..Time.now.year + 10, params["year"]), :class => 'input-small inline')
+
+      .modal-footer
+        =link_to "Process Membership Change", "#", :class => "btn btn-success", 'data-dismiss'=>'modal'
+        =link_to "Cancel", "#", :class => "btn btn-danger", 'data-dismiss'=>'modal'
+
+    #partial-refund.modal
+      .modal-header
+        .close{'data-dismiss'=>'modal'} x
+        %h3 Refund Membership
+      .modal-body
+        .control-group
+          %label Enter refund amount:
+          .controls
+            =text_field_tag "whatever", "", :class => "currency"
+        %p="#{@person} will receive a partial refund for the above amount and these memberships will be cancelled."  
+      .modal-footer
+        =link_to "Process Refund", "#", :class => "btn btn-success", 'data-dismiss'=>'modal'
+        =link_to "Cancel", "#", :class => "btn btn-danger", 'data-dismiss'=>'modal'
+
+    #cancel.modal
+      .modal-header
+        .close{'data-dismiss'=>'modal'} x
+        %h3 Cancel Membership
+      .modal-body
+        %p="These memberships will be cancelled."  
+      .modal-footer
+        =link_to "Cancel Memberhships", "#", :class => "btn btn-success", 'data-dismiss'=>'modal'
+        =link_to "Cancel", "#", :class => "btn btn-danger", 'data-dismiss'=>'modal'
+
+    #extend.modal
+      .modal-header
+        .close{'data-dismiss'=>'modal'} x
+        %h3 Change Expiration
+      .modal-body
+        .control-group
+          %label Change the expiration of these memberships to:
+          .controls
+            =text_field_tag "ends_at", "", :class => "datepicker"
+      .modal-footer
+        =submit_tag "Change Expiration", :class => "btn btn-success"
+        =link_to "Cancel", "#", :class => "btn btn-danger", 'data-dismiss'=>'modal' 
+
+-content_for :custom_js do
+  :javascript
+    $(".payment-method").change(function(){
+      if($(this).attr('value') != 'credit_card_manual'){
+        $("#payment-info").addClass("hidden");
+        $("#credit_card_number").val("")
+        $("#credit_card_name").val("")
+      } else {
+        $("#payment-info").removeClass("hidden");
+      }
+    });

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,52 @@
-.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.
+%fieldset.ng-cloak
+  %legend Required Info
+  .control-group{"ng-class" => "{error: ! data.organization.valid_name}"}
+    = form.label :name, "Organization Name", :class => 'control-label'
+    .controls
+      = form.text_field :name, :placeholder => 'Example Organization', :required => true, :class => 'input-xlarge no-fa', "ng-model" => "data.organization.name", "ng-init" => "data.organization.name = '#{form.object.name}'"
+      %p.text-error{"ng-hide" => "data.organization.valid_name"} Artful.ly already has an organization with this name and zip code. If you forgot your password or would like to be added to the pre-existing organization please email #{mail_to "support@artful.ly"}.
+
+  .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)
+
+%fieldset
+  %legend Details
+  .control-group
+    = form.label :country, :class => 'control-label'
+    .controls= form.select :country, [(h form.object.country || "United States")], selected: (form.object.country || "United States"), :required => true
+
+  .control-group
+    .control-label.form-inline
+      = form.label :state, 'State'
+      &
+      = form.label :zip, 'Zip'
+    .controls
+      = form.select :state, [nil, (h form.object.state || "New York")], selected: (form.object.state), :required => true
+      = form.text_field :zip, :placeholder => '10001', :class => 'span1', :required => true, "ng-model" => "data.organization.zip", "ng-init" => "data.organization.zip = '#{form.object.zip}'"
+
+  .control-group
+    = form.label :phone_number, 'Phone Number', :class => 'control-label'
+    .controls= form.text_field :phone_number, :placeholder => '(888) 692-7878', :required => true
+
+  .control-group
+    = form.label :website, :class => 'control-label'
+    .controls
+      .input-prepend
+        %span.add-on http://
+      = form.text_field :website, :placeholder => 'example.com'
+
+  .control-group
+    = form.label :discipline, :class => 'control-label hidden'
+    .controls= form.select :discipline, ['Dance', 'Film & Electronic Media', 'Literary Arts', 'Music', 'Theater', 'Visual Arts', 'Other'], {:include_blank => 'What kind of work does your organization primarily do?'}, {:class => 'span5', :required => true}
+
+  .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 "Save", :class => 'btn btn-primary disablable'
+  = form.submit "Save", :class => 'btn btn-primary disablable'

data/app/views/producer_mailer/donation_kit_notification.html.haml

@@ -0,0 +1,8 @@
+%h2= "Your organization #{@organization.name} has applied for a DonationKit in Artful.ly with the following details:"
+
+%ul
+  %li= "Organization Name: #{@organization.name}"
+  %li= "Legal Organization Name: #{@organization.legal_organization_name}"
+  %li= "EIN: #{@organization.ein}"
+
+To complete this activation, you must fax or email your IRS Determination Letter to FracturedAtlas.

data/app/views/producer_mailer/donation_kit_notification.text.erb

@@ -0,0 +1,8 @@
+
+Your organization <%=  @organization.name %> has applied for a DonationKit in Artful.ly with the following details:
+
+Organization Name: <%=  @organization.name %>
+Legal Organization Name: <%=  @organization.legal_organization_name %>
+EIN: <%=  @organization.ein %>
+
+To complete this activation, you must fax or email your IRS Determination Letter to FracturedAtlas.

data/app/views/producer_mailer/mailchimp_kit_initial_sync_notification.html.haml

@@ -0,0 +1,21 @@
+%h2 #{@organization.name} has successfully synced your Artful.ly account with the following MailChimp lists:
+
+- if @added_list_names.any?
+  %h3 Added:
+  %ul
+    - @added_list_names.each do |name|
+      %li= name
+
+- if @removed_list_names.any?
+  %h3 Removed:
+  %ul
+    - @removed_list_names.each do |name|
+      %li= name
+
+%p #{pluralize @kit.count_from_mailchimp, 'person'} synced from MailChimp
+%p #{pluralize @kit.count_merged_mailchimp, 'person'} merged from MailChimp
+
+%p From now on your Artful.ly People records and MailChimp members should stay in sync.
+
+%p Cheers,
+%p The Artful.ly Team

data/app/views/producer_mailer/ticket_offer_accepted.html.haml

@@ -0,0 +1,7 @@
+%h2 The ticket reseller #{@reseller.name} has accepted the following offer.
+
+%ul
+  %li Event:   #{@event.name}
+  %li Show:    #{@show.show_time}
+  %li Ticket Type: #{@ticket_type.name}
+  %li Tickets: #{pluralize @ticket_offer.count, "ticket"}

data/app/views/producer_mailer/ticket_offer_accepted.text.erb

@@ -0,0 +1,7 @@
+
+The ticket reseller <%= @reseller.name %> has accepted the following offer.
+
+Event:   <%= @event.name %>
+Show:    <%= @show.show_time %>
+Section: <%= @ticket_type.name %>
+Tickets: <%= pluralize @ticket_offer.count, "ticket" %>

data/app/views/producer_mailer/ticket_offer_rejected.html.haml

@@ -0,0 +1,11 @@
+%h2 The ticket reseller #{@reseller.name} has rejected the following offer.
+
+%ul
+  %li Event:   #{@event.name}
+  %li Show:    #{@show.show_time}
+  %li Ticket Type: #{@ticket_type.name}
+  %li Tickets: #{pluralize @ticket_offer.count, "ticket"}
+
+- if @ticket_offer.rejection_reason.present?
+  %h2 The reseller included the following comment:
+  = simple_format @ticket_offer.rejection_reason

data/app/views/producer_mailer/ticket_offer_rejected.text.erb

@@ -0,0 +1,13 @@
+
+The ticket reseller <%= @reseller.name %> has accepted the following offer.
+
+Event:   <%= @event.name %>
+Show:    <%= @show.show_time %>
+Section: <%= @section.name %>
+Tickets: <%= pluralize @ticket_offer.count, "ticket" %>
+
+<% if @ticket_offer.rejection_reason.present? %>
+The reseller included the following comment:
+
+<%= @ticket_offer.rejection_reason %>
+<% end %>

data/app/views/shared/_error_messages.html.haml

@@ -1,4 +1,4 @@
 - if !target.nil? && target.errors.any?
   .flash{:class => [bootstrapped_type(:error), :error, 'alert']}
     .close{ "data-dismiss" => "alert"} ×
-    = target.errors.full_messages.to_sentence
+    = clean_full_error_messages(target.errors)

data/app/views/store/events/_venue.html.haml

@@ -0,0 +1,7 @@
+#venue
+  %h6 Venue
+  =link_to image_tag("https://maps.google.com/maps/api/staticmap?size=140x140&maptype=roadmap&markers=color:red|#{event.venue.address_as_url_query}&sensor=false&zoom=15"), "https://maps.google.com/maps?q=#{event.venue.address_as_url_query.html_safe}&z=15"
+  %div
+    %strong=event.venue.name
+  %div=event.venue.street_as_string
+  %div=event.venue.city_state_zip_as_string

data/app/views/store/events/show.html.haml

@@ -1,12 +1,12 @@
 - content_for :title do
   Buy tickets to #{@event.name}
-.container
-  %h1#logo= @event.name
-  %p= @event.producer
+.container#multi-show-container
+  #event-header
+    %h1#logo= @event.name
+    %h4= @event.producer
 
   .row
     .span8  
-      %h6 Buy Tickets
 
       - @use_calendar = (@event.upcoming_public_shows.length > 5 || params[:calendar] == 'true')
       
@@ -38,13 +38,8 @@
                 =simple_format "#{@event.description} (#{link_to 'less','#', :class => 'toggle'})"
           - else
             =simple_format @event.description
-      #venue.side-section
-        %h6 Venue
-        =link_to image_tag("https://maps.google.com/maps/api/staticmap?size=140x140&maptype=roadmap&markers=color:red|#{@event.venue.address_as_url_query}&sensor=false&zoom=15"), "https://maps.google.com/maps?q=#{@event.venue.address_as_url_query.html_safe}&z=15"
-        %div
-          %strong=@event.venue.name
-        %div=@event.venue.street_as_string
-        %div=@event.venue.city_state_zip_as_string
+      .side-section
+        =render :partial => "venue", :locals => { :event => @event }
       - unless @event.contact_email.blank? && @event.contact_phone.blank?
         #contact.side-section
           %h6 Contact

data/app/views/store/events/single_show.html.haml

@@ -0,0 +1,41 @@
+- content_for :title do
+  Buy tickets to #{@event.name}
+
+.container#single-show-container
+  .row
+    .span8  
+
+      #event-header.side-section
+        %h1#logo= @event.name
+        %h4= @event.shows.first.show_time
+        %h4= @event.producer
+        %h4= @event.venue.city_state_zip_as_string
+
+      #about-event.side-section
+        #description
+          -if @event.description && @event.description.length > 600
+            .toggle-truncated
+              .truncated
+                = simple_format "#{truncate(@event.description, :length => 300)} (#{link_to 'more','#', :class => 'toggle'})"
+              .not-truncated{:style => 'display:none;'}
+                =simple_format "#{@event.description} (#{link_to 'less','#', :class => 'toggle'})"
+          - else
+            =simple_format @event.description
+
+      #show
+        =render :partial => 'store/shows/show', :locals => {:show => @event.shows.first, :collapsed => false}
+
+
+    .span4
+      .side-section.event-image
+        %center
+          - if @event.image?
+            = image_tag @event.image.url, :class => "event-poster", "data-toggle" => "modal", "data-target" => "#poster-modal"
+
+      .side-section.store-event-display
+        - unless @event.venue.address_as_string.blank?
+          =render :partial => "venue", :locals => { :event => @event }
+
+#poster-modal.modal.hide.fade
+  .modal-body
+    = image_tag @event.image.url