will/Open-Source-Access-Control-Web-Interface
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Adding payments

Browse Source
This commit is contained in:
Will Bradley
2013-02-12 01:58:17 -07:00
parent 3fb774d057
commit ed75ea0e90
29 changed files with 447 additions and 60 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
app/assets/javascripts/payments.js.coffee Normal file
View File

@@ -0,0 +1,3 @@
# Place all the behaviors and hooks related to the matching controller here.
# All this logic will automatically be available in application.js.
# You can use CoffeeScript in this file: http://jashkenas.github.com/coffee-script/

3
app/assets/stylesheets/payments.css.scss Normal file
View File

@@ -0,0 +1,3 @@
// Place all the styles related to the Payments controller here.
// They will automatically be included in application.css.
// You can use Sass (SCSS) here: http://sass-lang.com/

88
app/controllers/payments_controller.rb Normal file
View File

@@ -0,0 +1,88 @@
class PaymentsController < ApplicationController
load_and_authorize_resource :payment
load_and_authorize_resource :user, :through => :payment
before_filter :authenticate_user!
# Load users and certs based on current ability
before_filter do
@users = User.accessible_by(current_ability).sort_by(&:name_with_payee_and_member_level)
end
before_filter :only => [:create, :update] do
@payment.created_by = current_user.id
end
# GET /payments
# GET /payments.json
def index
@payments = @payments.order("date DESC")
respond_to do |format|
format.html # index.html.erb
format.json { render :json => @payments }
end
end
# GET /payments/1
# GET /payments/1.json
def show
respond_to do |format|
format.html # show.html.erb
format.json { render :json => @payment }
end
end
# GET /payments/new
# GET /payments/new.json
def new
respond_to do |format|
format.html # new.html.erb
format.json { render :json => @payment }
end
end
# GET /payments/1/edit
def edit
end
# POST /payments
# POST /payments.json
def create
Rails.logger.warn "payment:"
Rails.logger.warn @payment.inspect
respond_to do |format|
if @payment.save
format.html { redirect_to payments_url, :notice => 'Payment was successfully created.' }
format.json { render :json => @payment, :status => :created, :location => @payment }
else
format.html { render :action => "new" }
format.json { render :json => @payment.errors, :status => :unprocessable_entity }
end
end
end
# PUT /payments/1
# PUT /payments/1.json
def update
respond_to do |format|
if @payment.update_attributes(params[:payment])
format.html { redirect_to payments_url, :notice => 'Payment was successfully updated.' }
format.json { head :no_content }
else
format.html { render :action => "edit" }
format.json { render :json => @payment.errors, :status => :unprocessable_entity }
end
end
end
# DELETE /payments/1
# DELETE /payments/1.json
def destroy
@payment.destroy
respond_to do |format|
format.html { redirect_to payments_url }
format.json { head :no_content }
end
end
end

2
app/controllers/users_controller.rb
View File

@@ -15,7 +15,7 @@ class UsersController < ApplicationController
when "waiver"
@users = @users.sort_by{ |u| [-u.waiver.to_i,u.name] }
when "member"
@users = @users.sort_by{ |u| [-u.member.to_i,-u.member_level.to_i,u.name] }
@users = @users.sort_by{ |u| [-u.member_status.to_i,u.name] }
when "card"
@users = @users.sort_by{ |u| [-u.cards.count,u.name] }
when "instructor"

2
app/helpers/payments_helper.rb Normal file
View File

@@ -0,0 +1,2 @@
module PaymentsHelper
end

6
app/models/ability.rb
View File

@@ -28,6 +28,11 @@ class Ability
can :read, UserCertification
end
# Accountants can manage all
if user.accountant?
can :manage, Payment
end
# Admins can manage all
if user.admin?
can :manage, :all
@@ -41,6 +46,7 @@ class Ability
cannot :destroy, MacLog
cannot :destroy, UserCertification
cannot :destroy, DoorLog
# no exception for destroying payments
end
# Define abilities for the passed in user here. For example:
#

15
app/models/payment.rb Normal file
View File

@@ -0,0 +1,15 @@
class Payment < ActiveRecord::Base
belongs_to :user
attr_accessible :date, :user_id, :created_by
validates_presence_of :user_id, :date, :created_by
validates_uniqueness_of :date, :scope => :user_id, :message => ' of payment already exists for this user.'
def human_date
if date.year < DateTime.now.year
date.strftime("%b %e, %y")
else
date.strftime("%b %e")
end
end
end

117
app/models/user.rb
View File

@@ -9,46 +9,103 @@ class User < ActiveRecord::Base
:recoverable, :rememberable, :trackable, :validatable
# Setup accessible (or protected) attributes for your model
attr_accessible :email, :password, :password_confirmation, :remember_me, :name, :admin, :instructor, :member, :emergency_name, :emergency_phone, :current_skills, :desired_skills, :waiver, :emergency_email, :phone, :payment_method, :orientation, :member_level, :certifications, :hidden, :marketing_source #TODO: make admin/instructor/member/etc not accessible
attr_accessible :email, :password, :password_confirmation, :remember_me, :name, :admin, :instructor, :member, :emergency_name, :emergency_phone, :current_skills, :desired_skills, :waiver, :emergency_email, :phone, :payment_method, :orientation, :member_level, :certifications, :hidden, :marketing_source, :payee, :accountant #TODO: make admin/instructor/member/etc not accessible
has_many :cards
has_many :user_certifications
has_many :certifications, :through => :user_certifications
has_many :payments
after_create :send_new_user_email
def member_status
output = ""
if self.member_level.to_i >= 1 then
output = "<span class='hoverinfo' title='Inactive'>&#9676;</span>"
def name_with_payee_and_member_level
if payee.blank? then
"#{name} - #{member_level_string}"
else
"#{payee} for #{name} - #{member_level_string}"
end
unless self.member.nil? then
# 1 = inactive, show an X
if self.member >= 10 then
output = "<span class='hoverinfo' title='Volunteer'>&#9684;</span>"
# 25 or higher is paying, show a check
end
if self.member >= 25 then
output = "<span class='hoverinfo' title='25'>&#9681;</span>"
end
if self.member >= 50 then
output = "<span class='hoverinfo' title='50'>&#9685;</span>"
end
if self.member >= 100 then
output = "<span class='hoverinfo' title='100'>&#9679;</span>"
end
if self.member < self.member_level.to_i then
output = "<span class='hoverinfo' title='Lapsed'>&#x2717;</span>"
end
end
return output
end
def member_level_string
case self.member_level.to_i
when 0
"None"
when 1
"Unable"
when 10..24
"Volunteer"
when 25..49
"Associate ($25)"
when 50..99
"Basic ($50)"
when 100..999
"Plus ($100)"
end
end
def member_status
case self.member_level.to_i
when 0
if self.payments.count > 0 then
2
else
-1
end
when 1
1
when 10..24
10
when 25..999
if self.payments.count > 0 then
if self.payments.last.date < (DateTime.now - 1.month)
3
else
case self.member_level.to_i
when 25..49
25
when 50..99
50
when 100..999
100
end
end
else
return 0
end
end
end
def member_status_symbol
case self.member_level.to_i
when 0
if self.payments.count > 0 then
"<span class='hoverinfo' title='Former Member'>:(</span>"
else
"<!-- Not a member -->"
end
when 1
"Unable"
when 10..24
"<span class='hoverinfo' title='Volunteer'>&#9684;</span>"
when 25..999
if self.payments.count > 0 then
if self.payments.last.date < (DateTime.now - 1.month)
"<span class='hoverinfo' title='Lapsed'>&#9676;</span>"
else
case self.member_level.to_i
when 25..49
"<span class='hoverinfo' title='#{member_level_string}'>&#9681;</span>"
when 50..99
"<span class='hoverinfo' title='#{member_level_string}'>&#9685;</span>"
when 100..999
"<span class='hoverinfo' title='#{member_level_string}'>&#9679;</span>"
end
end
else
"<span class='hoverinfo' title='No Payments'>?</span>"
end
end
end
private

1
app/views/layouts/application.html.erb
View File

@@ -17,6 +17,7 @@
<% else %>
<%= link_to 'Certifications', certifications_path if can? :read, Certification %>
<% end %>
<%= link_to 'Payments', payments_path if can? :read, Payment %>
<%= link_to 'Door Logs', door_logs_path if can? :read, DoorLog %>
<%= link_to 'Computers', macs_path if user_signed_in? && (can? :read, Mac) %>
<% if user_signed_in? then %><%= link_to 'Profile', edit_user_registration_path %><% end %>

25
app/views/payments/_form.html.erb Normal file
View File

@@ -0,0 +1,25 @@
<%= form_for(@payment) do |f| %>
<% if @payment.errors.any? %>
<div id="error_explanation">
<h2><%= pluralize(@payment.errors.count, "error") %> prohibited this payment from being saved:</h2>
<ul>
<% @payment.errors.full_messages.each do |msg| %>
<li><%= msg %></li>
<% end %>
</ul>
</div>
<% end %>
<div class="field">
<%= f.label :user_id, "User" %><br />
<%= collection_select(:payment, :user_id, @users, :id, :name_with_payee_and_member_level) %>
</div>
<div class="field">
<%= f.label :date, "Paid for month beginning" %><br />
<%= f.date_select :date %>
</div>
<div class="actions">
<%= f.submit %>
</div>
<% end %>

6
app/views/payments/edit.html.erb Normal file
View File

@@ -0,0 +1,6 @@
<h1>Editing payment</h1>
<%= render 'form' %>
<%= link_to 'Show', @payment %> |
<%= link_to 'Back', payments_path %>

24
app/views/payments/index.html.erb Normal file
View File

@@ -0,0 +1,24 @@
<h1>Listing payments</h1>
<%= link_to 'New Payment', new_payment_path %>
<br />
<table>
<tr>
<th>User</th>
<th>Paid for month <br/>beginning</th>
<th></th>
<th></th>
<th></th>
</tr>
<% @payments.each do |payment| %>
<tr>
<td><%= link_to payment.user.name_with_payee_and_member_level, payment.user unless payment.user.blank? %></td>
<td><%= payment.human_date %></td>
<td><%= link_to 'Details', payment %></td>
<td><%= link_to 'Edit', edit_payment_path(payment) %></td>
</tr>
<% end %>
</table>

5
app/views/payments/new.html.erb Normal file
View File

@@ -0,0 +1,5 @@
<h1>New payment</h1>
<%= render 'form' %>
<%= link_to 'Back', payments_path %>

29
app/views/payments/show.html.erb Normal file
View File

@@ -0,0 +1,29 @@
<p>
<b>User:</b>
<%= @payment.user.name_with_payee_and_member_level unless @payment.user.blank? %>
</p>
<p>
<b>Paid for month beginning:</b>
<%= @payment.date %>
</p>
<p>
<b>Last Modified by:</b>
<%= user = @users.find{|u| u.id == @payment.created_by}; link_to user.name, user unless user.blank? %>
</p>
<p>
<b>Created date:</b>
<%= @payment.created_at %>
</p>
<p>
<b>Updated date:</b>
<%= @payment.updated_at %>
</p>
<%= link_to 'Edit', edit_payment_path(@payment) %> |
<%= link_to 'Destroy', @payment, :confirm => 'Are you sure you want to destroy this payment?', :method => :delete if can? :destroy, @payment %> |
<%= link_to 'Back', payments_path %>

28
app/views/user_mailer/new_user_email.html.erb
View File

@@ -12,18 +12,22 @@
<p>
User Details: <%= link_to @url+user_path(@user), @url+user_path(@user) %>
</p>
<p>
<b>What skills, knowledge and experience do you bring to the community?</b>
<%= simple_format @user.current_skills %>
</p>
<p>
<b>What skills, knowledge and experiences are you looking for in HeatSync?</b>
<%= simple_format @user.desired_skills %>
</p>
<p>
<b>How'd you find out about HeatSync?</b>
<%= simple_format @user.marketing_source %>
</p>
<p>
<b>Member Level:</b>
<%= simple_format @user.member_level_string %>
</p>
<p>
<b>What skills, knowledge and experience do you bring to the community?</b>
<%= simple_format @user.current_skills %>
</p>
<p>
<b>What skills, knowledge and experiences are you looking for in HeatSync?</b>
<%= simple_format @user.desired_skills %>
</p>
<p>
<b>How'd you find out about HeatSync?</b>
<%= simple_format @user.marketing_source %>
</p>
</body>
</html>

1
app/views/user_mailer/new_user_email.text.erb
View File

@@ -4,6 +4,7 @@ Please contact them at <%= @user.email %><%= " or "+@user.phone.to_s unless @use
new user orientation, waiver, welcome, payment help, etc.
User Details: <%= link_to @url+user_path(@user), @url+user_path(@user) %>
Member Level: <%= simple_format @user.member_level %>
What skills, knowledge and experience do you bring to the community?
<%= simple_format @user.current_skills %>

12
app/views/users/_form.html.erb
View File

@@ -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 %>

10
app/views/users/index.html.erb
View File

@@ -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>

19
app/views/users/show.html.erb
View File

@@ -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 %>