Adding payments

app/views/users/_form.html.erb

@@ -65,6 +65,10 @@
   <div class="field">
     <%= render :partial => "/users/payment_methods", :locals => { :g => f } %>
   </div>
+  <div class="field">
+    <%= f.label :payee %><br />
+    <%= f.text_field :payee%>
+  </div>
   <div class="field">
     <%= f.label :phone %><br />
     <%= f.text_field :phone %>
@@ -81,10 +85,6 @@
     <%= f.label :marketing_source, "How'd you find out about HeatSync?" %><br />
     <%= f.text_area :marketing_source %>
   </div>
-  <div class="field">
-    <%= f.label :member, "Member?" %><br />
-    <%= f.select :member, [[nil],["No",0],["Inactive",1],["Volunteer",10],["Associate",25],["Basic",50],["Plus",100]]  %>
-  </div>
   <div class="field">
     <%= f.label :instructor, "Instructor?" %><br />
     <%= f.check_box :instructor %>
@@ -93,6 +93,10 @@
     <%= f.label :admin, "Admin?" %><br />
     <%= f.check_box :admin %>
   </div>
+  <div class="field">
+    <%= f.label :accountant, "Accountant?" %><br />
+    <%= f.check_box :accountant %>
+  </div>
   <div class="field">
     <%= f.label :hidden, "Hidden?" %><br />
     <%= f.check_box :hidden %>

app/views/users/index.html.erb

@@ -8,8 +8,8 @@
   <col />
   <% if current_user.admin? then %><col /><% end %>
   <col />
-  <% if current_user.admin? %><col /><% end %>
-  <col class="col_highlight" />
+  <% if current_user.admin? %><col />
+  <col class="col_highlight" /><% end %>
   <col />
   <col class="col_highlight" />
   <col />
@@ -26,7 +26,7 @@
     <th><a href="?sort=member">Member?</a></th>
     <th><a href="?sort=card">Card?</a></th>
     <th><a href="?sort=instructor">Instructor?</a></th>
-    <th><a href="?sort=admin">Admin?</a></th>
+    <% if current_user.admin? then %><th><a href="?sort=admin">Admin?</a></th><% end %>
     <th></th>
     <th></th>
   </tr>
@@ -44,10 +44,10 @@
       <%= unless user.orientation.blank? then raw("<span class='hoverinfo' title='"+user.orientation.strftime("%B %d %Y")+"'>&#x2713;</span>") end %>
     </td><% end %>
     <td><%= unless user.waiver.blank? then raw("<span class='hoverinfo' title='"+user.waiver.strftime("%B %d %Y")+"'>&#x2713;</span>") end %></td>
-    <td><%= raw(user.member_status) %></td>
+    <td><%= raw(user.member_status_symbol) %></td>
     <td><%= unless user.cards.blank? then raw("<span class='iconinfo'>&#x2713;</span>") end %></td>
     <td><%= if user.instructor? then raw("<span class='iconinfo'>&#x2713;</a>") end %></td>
-    <td><%= if user.admin? then raw("<span class='iconinfo'>&#x2713;</a>") end %></td>
+    <% if current_user.admin? then %><td><%= if user.admin? then raw("<span class='iconinfo'>&#x2713;</a>") end %></td><% end %>
     <td><%= link_to 'Edit', edit_user_path(user) if can? :update, user %></td>
     <td><%= link_to 'Destroy', user, :confirm => 'Are you sure? WARNING: THIS DOES NOT REMOVE THE USER FROM THE DOOR SYSTEM! DISABLE THEM FIRST.', :method => :delete if can? :destroy, user %></td>
   </tr>

app/views/users/show.html.erb

@@ -12,7 +12,7 @@
 
 <p>
   <b>Current Member?</b>
-  <%= raw(@user.member_status) %>
+  <%= raw(@user.member_status_symbol) %>
 </p>
 
 <p>
@@ -20,12 +20,6 @@
   <%= @user.instructor? %>
 </p>
 
-<p>
-  <b>Admin?</b>
-  <%= @user.admin? %>
-</p>
-
-
 <% if current_user.admin? then %>
 <p>
   <b>Email:</b>
@@ -56,6 +50,10 @@
     <b>Payment Method:</b>
     <%= @user.payment_method %>
   </p>
+  <p>
+    <b>Payee:</b>
+    <%= @user.payee %>
+  </p>
   <p>
     <b>Phone:</b>
     <%= @user.phone %>
@@ -94,5 +92,12 @@
   <% if @user.certifications.blank? %><li>n/a</li><% end %>
 </ul>
 
+<% if current_user.admin? then %>
+<p>
+  <b>Created:</b>
+  <%= @user.created_at %>
+</p>
+<% end %>
+
 <% if can? :update, @user then %><%= link_to 'Edit', edit_user_path(@user) %> |<% end %>
 <%= link_to 'Back', users_path %>