artfully_ose 1.2.0.beta.1 → 1.2.0.pre

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

@@ -1,40 +1,40 @@
 - content_for :title do
-  Become a Member of #{@store_organization.name}
-  
+  Become a Member
 .container
   %h1 Become a Member
 
-  .row#membership-storefront
+  .row
     .span8  
       #salesy{:style => "margin-bottom: 20px"} 
-        =@membership_kit.marketing_copy_heading.html_safe
+        %h6{:style => "color: #9d2235"} YOUR TICKETS, YOUR WAY
+        We’re excited to announce a re-designed membership and play package plan that works for both your schedule and your budget. With the Atlantic Select Membership, you pay a one-time enrollment fee of $75 and then choose which plays you want to see at just $30 per ticket – that’s close to 60% off the regular ticket prices!  Or check out our 3-Play Pass and 4-Play Pass options. Pay up front and receive one ticket to any three or four Atlantic productions (Mainstage or Stage 2) of your choosing. Or take a look at our Tix for Two – for just $99, you’ll receive two tickets to any production of your choosing. Details below!
 
       - @membership_types.each do |membership_type|
-        .row-fluid{:id => "membership-type-#{membership_type.id}"}
+        .row-fluid
           .span12
             %ul#memberships.unstyled
               %li
                 .title.active
                   .price
-                    =number_as_cents membership_type.price_for(current_member)
+                    =number_as_cents membership_type.price
                   .membership_type_name
                     =membership_type.name
             =membership_type.description
             %br
             %br
             .section
-              = form_for membership_type, :as => :membership_type, :url => store_order_path(@store_organization.cached_slug), :html => {:id => "edit_membership_type_#{membership_type.id}"}, :method => :post do |f| 
+              = form_for membership_type, :url => store_order_path(@store_organization.cached_slug), :method => :post do |f| 
                 = f.hidden_field :id
-                
-                -if membership_type.allow_multiple_memberships?
-                  %span.quantity-select
-                    = select_tag :quantity, options_for_select((1..membership_type.limit_per_transaction).to_a.map {|i| [pluralize(i, "#{membership_type.name} Membership"), i]})
-                -else
-                  %span.quantity-hidden
-                    = hidden_field_tag :quantity, "1"
-
-                = f.submit 'Add to cart', :class => 'add-to-cart btn btn-primary', :style => 'margin-top: -10px'
+                = select_tag :quantity, options_for_select((1..6).to_a.map {|i| [pluralize(i, "#{membership_type.name} Membership"), i]})
+                = f.submit 'Add to cart', :class => 'btn btn-primary', :style => 'margin-top: -10px'
       
     .span4
       .side-section
-        =@membership_kit.marketing_copy_sidebar.html_safe
+        %h6{:style => "color: #9d2235"} GREAT BENEFITS
+        Scheduling flexibility. Priority booking. No service charges on tickets. Discounted guest tickets. These are just a few of the benefits you enjoy as a Member. We are also continuing our popular Members Only event series, which debuted last season. Play Pass holders receive priority booking and ticket exchange privileges.
+      .side-section
+        %h6{:style => "color: #9d2235"} BECOME A PART OF SOMETHING BIG.
+        As an Atlantic Member or Play Pass holder, you are among the most dedicated and enthusiastic of all our audiences. We can’t wait for you to see our beautiful new space and experience another year of exciting new plays.
+      .side-section
+        %h6{:style => "color: #9d2235"} JOIN TODAY.
+        Checkout online here or call 212-279-4200 for assistance.

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

@@ -20,23 +20,15 @@
 
           -unless current_cart.memberships.empty?
             %h4 Memberships
-            %table.table#memberships-table
+            %table.table
               -current_cart.memberships.each do |membership|
                 %tr
                   %td=membership.membership_type.membershipize
-                  %td.right=number_as_cents membership.price
-
-          -unless current_cart.passes.empty?
-            %h4 Passes
-            %table.table#passes-table
-              -current_cart.passes.each do |pass|
-                %tr
-                  %td=pass.pass_type.passerize
-                  %td.right=number_as_cents pass.price
+                  %td.right=number_as_cents membership.membership_type.price
 
           -unless current_cart.donations.empty?
             %h4 Donations
-            %table.table#donations-table
+            %table.table
               -current_cart.donations.each do |donation|
                 %tr
                   %td="Donation to #{@store_organization.name}"
@@ -45,38 +37,35 @@
           = form_tag store_order_path(@store_organization.cached_slug) do
             %table.table
               %tr#discount-input{:style => 'display:none'}
-                %td
-                  = text_field_tag 'discount_or_pass_code', params[:discount_or_pass_code], :placeholder => @enter_code_string, :style => "margin-bottom:0px"
-                  -with_kit(:passes) do
-                    .tip=link_to "Forget your pass code?"
+                %td= text_field_tag 'discount', params[:discount], :placeholder => "Enter discount here, eg. COWBELL"
                 %td= button_tag "Apply", :class => 'btn btn-primary', :disable_with => "Applying..."
-              -if current_cart.has_discount_or_pass?
+              -if current_cart.discount.nil?
+                %tr#discount-link
+                  %td= link_to "Apply Discount Code", "#"
+              -else          
                 %tr#discount-display
                   %td.details
-                    Code
-                    %span=current_cart.applied_code
+                    Discount code
+                    %span=current_cart.discount.code
                     #discount-link= link_to "Change", "#", :class => 'btn btn-primary'
                   %td.right.amount
                     =number_as_cents current_cart.discount_amount
-              -else     
-                %tr#discount-link
-                  %td= link_to @enter_code_string, "#"     
 
           %table.table#totals-table
             -unless current_cart.fee_in_cents == 0
               %tr
                 %td Service Charge
-                %td.right#service-charge=number_as_cents current_cart.fee_in_cents
+                %td.right=number_as_cents current_cart.fee_in_cents
             %tr
               %td
                 %b Total
-              %td.right#cart-total
+              %td.right
                 %b=number_as_cents current_cart.total
 
           = link_to "Clear My Cart", store_order_path, :method => :delete, :data => { :confirm => 'Are you sure you want to empty your cart?' }
 
-        - if @store_organization.has_kit?(:regular_donation) || @store_organization.has_kit?(:sponsored_donation)
-          = render 'store/shared/small_donate_form'
+        =render "store/shared/donate_form"
+
 
     .span7
       -unless current_cart.empty?
@@ -141,17 +130,17 @@
                   .control-group
                     = card.label :name, "Cardholder Name", :class => 'control-label'
                     .controls= card.text_field :name, :class => 'required'
-
+                    
                   .control-group
                     = card.label :number, "Card Number", :class => 'control-label'
                     .controls= card.text_field :number, :class => 'required'
-
+                    
                   .control-group
                     = card.label :verification_value, "CVV", :class => 'control-label'
                     .controls
                       = card.text_field :verification_value, :class => 'required span1'
                       = image_tag 'storefront/cvv.gif'
-
+                      
                   .control-group
                     = card.label :expiration, "Expiration", :class => 'control-label'
                     .controls
@@ -175,10 +164,10 @@
             .control-group
               .controls
                 %label.checkbox
-                  I have read, understand and accept the terms and conditions of the
+                  I have read, understand and accept the terms and conditions of the 
                   =link_to "User Agreement", "#user-agreement-modal", 'data-toggle' => 'modal'
                   = check_box_tag "payment[user_agreement]", 1, false, :class => 'required-checkbox', :id => 'agreement-checkbox'
-
+              
             = hidden_field_tag :confirmation, 1
             .form-actions.cart-actions
               %h4.cart-error-message Please correct the errors above
@@ -186,13 +175,13 @@
                 .span8
                   %h2#cart-total= number_as_cents current_cart.total
                 .span4
-                  = submit_tag 'Buy Now', :id => 'complete-purchase', :class => 'btn btn-primary btn-large pull-right'
+                  = submit_tag 'Buy Now', :id => 'complete-purchase', :class => 'btn btn-primary btn-large pull-right'  
 
     #user-agreement-modal.modal.hide
       .modal-header
         .close{'data-dismiss'=>'modal'} x
-        %h3 Artful.ly User Agreement
+        %h3 Artful.ly User Agreement    
       .modal-body
         = t("pages.user_agreement.content", :default => "")
       .modal-footer
-        =link_to "Close", "#", :class => "btn", 'data-dismiss'=>'modal'
+        =link_to "Close", "#", :class => "btn", 'data-dismiss'=>'modal' 

data/app/views/store/shared/_donate_form.html.haml

@@ -1,31 +1,12 @@
-- donation_kit = @donation_kit || @store_organization.kit(:regular_donation)
-= form_tag store_order_path(@store_organization.cached_slug), :method => :post, :class => 'add-donation-to-cart form-inline' do
-  = hidden_field_tag :_source, 'storefront'
-
-  - if donation_kit.suggested_gifts.present? && donation_kit.suggested_gifts.any?
-    - donation_kit.suggested_gifts.each_with_index do |suggested_gift, index|
-      .preset-amount
-        %label{:for => "suggested_gift_#{index}", :class => 'control-label inline radio'}
-          - label_text = suggested_gift['level_name'].present? ? "#{suggested_gift['level_name']} ($#{format('%.2f', suggested_gift['amount'])})" : "$#{format('%.2f', suggested_gift['amount'])}"
-          = radio_button_tag :suggested_gift, suggested_gift['amount'], false, :id => "suggested_gift_#{index}", :class => 'preset_radio'
-          = label_text
-
-    - if donation_kit.open_gift_field == '1'
-      .preset-amount
-        %label{:for => :suggested_gift_42, :class => 'control-label inline radio'}
-          = radio_button_tag :suggested_gift, 0, false, :id => 'suggested_gift_42', :class => 'preset_radio'
-          Other
-
-        .input-prepend
-          %span.add-on $
-          = text_field_tag :donation_amount, '', :class => 'span1'
-    = hidden_field_tag :donation_amount_fixed, ''
-
-    %br{:style => 'clear: both;'}
-    = submit_tag 'Add Donation', :class => 'btn btn-primary', :id => 'add-donation'
-
-  - else
-    .input-prepend
-      %span.add-on $
-      = text_field_tag :donation_amount, '', :class => 'span1'
-    = submit_tag 'Add Donation', :class => 'btn btn-primary', :id => 'add-donation'
+- if @store_organization.authorization_hash[:authorized]
+  #donation.side-section
+    %h6 Donate
+    - if @store_organization.authorization_hash[:type] == :sponsored
+      %p="#{@store_organization.authorization_hash[:fsp_name]} is a fiscally sponsored project of Fractured Atlas, a non-profit arts service organization. Donations for the purposes of #{@store_organization.authorization_hash[:fsp_name]} must be made payable to Fractured Atlas and are tax-deductible to the extent permitted by law."
+    - else
+      %p Help support our work by adding a donation to your order! Donations are tax-deductible to the extent permitted by law.
+    = form_tag store_order_path(@store_organization.cached_slug), :method => :post, :class => 'add-donation-to-cart form-inline' do
+      .input-prepend
+        %span.add-on $
+        = text_field_tag :donation_amount, '', :class => 'span1'
+      = submit_tag 'Add Donation', :class => 'btn btn-primary'

data/app/views/store/shows/_show.html.haml

@@ -1,4 +1,3 @@
-
 .title.active
   .date
     .month= show.datetime_local_to_event.strftime("%b")
@@ -12,39 +11,32 @@
 .sections{:style => "#{'display:none' if collapsed}"}
   - if show.chart.sections.storefront.empty?
     No tickets are available for this show
-  - else
-    %table.table.available-ticket-type-table
-      - show.sections_for(current_member).each do |section|
-        -section.ticket_types_for(current_member).each do |ticket_type|
-          %tr
-            %td.ticket-type-name
-              = ticket_type.name
-            %td.right.span2.ticket-type-price
-              %span{:class => 'price'}= number_as_cents(ticket_type.price)
-            %td.right.span4.controls
-              = form_tag store_order_path(@store_organization.cached_slug), :class => 'add-tickets-to-cart', :id => "add-tickets-to-cart-#{ticket_type.id}" do
-                = hidden_field_tag :show_id, show.id
-                = hidden_field_tag :ticket_type_id, ticket_type.id
-                = hidden_field_tag :section_name, ticket_type.name
-                = hidden_field_tag :ticket_price, ticket_type.price
-
-                - available = ticket_type.available("storefront", current_member)
-                - if available == 0
-                  %select{:style => "width:140px", :class => 'ticket-type-quantity', :id => 'quantity', :name => 'quantity'}
-                    %option SOLD OUT
-                - else
-                  = select_tag :quantity, options_for_select((1..[10, available].min).to_a.map {|i| [pluralize(i, 'Ticket'), i]}), :style => "width:140px", :class => 'ticket-type-quantity'
-
-                = submit_tag 'Add to cart', :class => 'add-to-cart btn btn-primary'
-          %tr.no-border
-            %td.ticket-type-description{:colspan => "4"}
-              -unless ticket_type.description.nil?
-                -description = ticket_type.description
-                -if description.length > 150
-                  .toggle-truncated
-                    .truncated
-                      = simple_format "#{truncate(description, :length => 150)} (#{link_to 'more','#', :class => 'toggle'})"
-                    .not-truncated{:style => 'display:none;'}
-                      =simple_format "#{description} (#{link_to 'less','#', :class => 'toggle'})"
-                - else
-                  =simple_format description
+  - show.sections_for(current_member).each do |section|
+    -section.ticket_types_for(current_member).each do |ticket_type|
+      .section
+        %h4
+          = ticket_type.name
+          %span{:class => 'price'}= number_as_cents(ticket_type.price)
+        -unless ticket_type.description.nil?
+          -description = ticket_type.description
+          -if description.length > 150
+            .toggle-truncated
+              .truncated
+                = simple_format "#{truncate(description, :length => 150)} (#{link_to 'more','#', :class => 'toggle'})"
+              .not-truncated{:style => 'display:none;'}
+                =simple_format "#{description} (#{link_to 'less','#', :class => 'toggle'})"
+          - else
+            =simple_format description
+            
+        = form_tag store_order_path(@store_organization.cached_slug), :class => 'add-tickets-to-cart' do
+          = hidden_field_tag :show_id, show.id
+          = hidden_field_tag :ticket_type_id, ticket_type.id
+          = hidden_field_tag :section_name, ticket_type.name
+          = hidden_field_tag :ticket_price, ticket_type.price
+          - if ticket_type.available == 0
+            %select{:style => "width:140px"}
+              %option
+                SOLD OUT
+          - else
+            = select_tag :quantity, options_for_select((1..[10, ticket_type.available].min).to_a.map {|i| [pluralize(i, 'Ticket'), i]}), :style => "width:140px"
+            = submit_tag 'Add to cart', :class => 'btn btn-primary'

data/app/views/user_memberships/_list.html.haml

@@ -1,30 +1,31 @@
-.row
-  .span3
-    %h3{:style => "margin-top: 0px"} Users
+.row-fluid
+  %h2.span2 Users
+  .span10
     - if can? :manage, current_user.current_organization
-      = link_to "Invite User", "#userForm", 'data-toggle' => 'modal', :class => 'btn'
-  .span9
-    %ul#memberships.detailed-list.row-fluid
-      - organization.users.each do |user|
-        %li.row-fluid
-          .span2
-            = gravatar_image_tag(user.email, :alt => 'User icon', :class => 'user-grav bordered', :gravatar => { :size => 48 })
-          .span9
-            .email= truncate(user.email)
-            .remove
-              - if user == current_user.current_organization.owner
-                Organization Administrator
-              - elsif can? :manage, current_user.current_organization
-                = link_to "Remove", organization_user_membership_path(@organization, user.membership_in(organization)), :method => :delete
+      = link_to "Add", "#userForm", 'data-toggle' => 'modal', :class => 'btn'
+%ul#memberships.detailed-list.row-fluid
+  - organization.users.each do |user|
+    %li.span5.row-fluid
+      .span3
+        = gravatar_image_tag(user.email, :alt => 'User icon', :class => 'user-grav bordered', :gravatar => { :size => 48 })
+      .span9
+        .email= truncate(user.email)
+        .remove
+          - if user == current_user.current_organization.owner
+            Organization Administrator
+          - elsif can? :manage, current_user.current_organization
+            = link_to "Remove", organization_user_membership_path(@organization, user.membership_in(organization)), :method => :delete
 
-    #userForm.modal
-      = form_tag organization_user_memberships_path(@organization.id), :action => "create" do
-        .modal-header
-          .close{'data-dismiss'=>'modal'} x
-          %h3 Add A User To Your Organization
-        .modal-body
-          %p
-            Enter the user's email address below.  The user will receive an email with a link to join Artful.ly and set his or her password.
-          = text_field_tag :user_email, "", :placeholder => "Enter an email address..."
-        .modal-footer
-          = submit_tag "Add", :class => 'btn'
+#userForm.modal
+  = form_tag organization_user_memberships_path(@organization.id), :action => "create" do
+    .modal-header
+      .close{'data-dismiss'=>'modal'} x
+      %h3 Add A User To Your Organization
+    .modal-body
+      %p
+        Enter the user's email address below.  The user will receive an email with a link to join Artful.ly and set his or her password.
+      = text_field_tag :user_email, "", :placeholder => "Enter an email address..."
+    .modal-footer
+      = submit_tag "Add", :class => 'btn'
+      
+    

data/app/views/users/invitations/edit.html.haml

@@ -2,28 +2,18 @@
 
 .instructions.well
   The administrator for
-  %strong=resource.user_memberships.first.organization.name
+  %strong=resource.user_memberships.first.organization.name 
   has invited you to join their organization.  Enter a password for your account and click 'Sign Up' to begin using Artfully!
 
-%fieldset
-  = form_for resource, as: resource_name, url: invitation_path(resource_name), html: {method: :put, class: "form-horizontal"} do |f|
+.account-details
+  = form_for resource, :as => resource_name, :url => invitation_path(resource_name), :html => { :method => :put } do |f|
     = devise_error_messages!
     = f.hidden_field :invitation_token
-
-    .control-group
-      = f.label :first_name, 'First Name', :class => 'control-label'
-      .controls= f.text_field :first_name, :required => true, tabindex: "1"
-    .control-group
-      = f.label :last_name, 'Last Name', :class => 'control-label'
-      .controls= f.text_field :last_name, :required => true, tabindex: "2"
     .control-group
-      = f.label :email, :class => 'control-label'
-      .controls= f.text_field :email, :placeholder => 'example@fracturedatlas.org', :required => true, tabindex: "3"
+      = f.label :password, :class=>'control-label'
+      .controls= f.password_field :password
     .control-group
-      = f.label :password, :class => 'control-label'
-      .controls= f.password_field :password, :required => true, tabindex: "4"
-    .control-group
-      = f.label :password_confirmation, "Retype Password", :class => 'control-label'
-      .controls= f.password_field :password_confirmation, :required => true, tabindex: "5"
-    .form-actions
-      %p= f.submit "Sign Up", class: "btn btn-primary btn-large", tabindex: "7"
+      = f.label :password_confirmation, :class=>'control-label'
+      .controls= f.password_field :password_confirmation
+
+    = f.submit "Sign Up", :class => "btn"

data/app/views/users/mailer/invitation_instructions.html.erb

@@ -0,0 +1,8 @@
+<p>Hello <%= @resource.email %>!</p>
+
+<p><%= @resource.invited_by.email %> has invited you to join <%= link_to(@resource.invited_by.user_memberships.first.organization.name, root_url) %>. You can accept it through the link below.</p>
+
+<p><%= link_to 'Accept invitation', accept_invitation_url(@resource, :invitation_token => @resource.invitation_token) %></p>
+
+<p>If you don't want to accept the invitation, please ignore this email.<br />
+Your account won't be created until you access the link above and set your password.</p>

data/app/views/users/passwords/edit.html.haml

@@ -6,11 +6,11 @@
 
     .control-group
       = f.label :password, :class=>'control-label'
-      .controls= f.password_field :password, autocomplete: 'off'
+      .controls= f.password_field :password
 
     .control-group
       = f.label :password_confirmation, "Retype Password", :class=>'control-label'
-      .controls= f.password_field :password_confirmation, autocomplete: 'off'
+      .controls= f.password_field :password_confirmation
 
     = f.hidden_field :reset_password_token
 

data/app/views/users/registrations/edit.html.erb

@@ -7,13 +7,13 @@
   <%= f.text_field :email %></p>
 
   <p><%= f.label :password %> <i>(leave blank if you don't want to change it)</i><br />
-  <%= f.password_field :password, autocomplete: 'off' %></p>
+  <%= f.password_field :password %></p>
 
   <p><%= f.label :password_confirmation %><br />
-  <%= f.password_field :password_confirmation, autocomplete: 'off' %></p>
+  <%= f.password_field :password_confirmation %></p>
 
   <p><%= f.label :current_password %> <i>(we need your current password to confirm your changes)</i><br />
-  <%= f.password_field :current_password, autocomplete: 'off' %></p>
+  <%= f.password_field :current_password %></p>
 
   <p><%= f.submit "Update", :class => "btn" %></p>
 <% end %>

data/app/views/users/sessions/new.html.haml

@@ -1,6 +1,6 @@
 = devise_error_messages!
 
-= form_for(resource, :as => resource_name, :url => session_path(resource_name), :html => {:class => 'form-horizontal'}) do |f|
+= form_for(resource, :as => resource_name, :url => session_path(resource_name), :html => {:class => 'form-horizontal'}) do |f|  
 
   %fieldset
     %legend Sign In
@@ -13,7 +13,7 @@
     .control-group
       = f.label :password, :class=>'control-label', :tabindex => "2"
       .controls
-        = f.password_field :password, autocomplete: 'off'
+        = f.password_field :password
         %p.help-block= link_to "Forgot your password?", new_password_path(resource_name)
 
     .form-actions