From 2c8781ebc1f247750416c7acfdfa92a48f38c0e9 Mon Sep 17 00:00:00 2001 From: cktricky Date: Fri, 14 Mar 2014 20:29:14 -0400 Subject: [PATCH] added a pay controller and model --- app/controllers/pay_controller.rb | 2 ++ app/helpers/pay_helper.rb | 2 ++ app/models/pay.rb | 5 +++++ app/models/user.rb | 1 + app/views/layouts/shared/_sidebar.html.erb | 8 ++++++++ app/views/sessions/new.html.erb | 5 ++--- db/migrate/20140315002730_create_pays.rb | 12 ++++++++++++ db/schema.rb | 11 ++++++++++- spec/controllers/pay_controller_spec.rb | 5 +++++ spec/helpers/pay_helper_spec.rb | 15 +++++++++++++++ spec/models/pay_spec.rb | 5 +++++ 11 files changed, 67 insertions(+), 4 deletions(-) create mode 100644 app/controllers/pay_controller.rb create mode 100644 app/helpers/pay_helper.rb create mode 100644 app/models/pay.rb create mode 100644 db/migrate/20140315002730_create_pays.rb create mode 100644 spec/controllers/pay_controller_spec.rb create mode 100644 spec/helpers/pay_helper_spec.rb create mode 100644 spec/models/pay_spec.rb diff --git a/app/controllers/pay_controller.rb b/app/controllers/pay_controller.rb new file mode 100644 index 0000000..a91df4f --- /dev/null +++ b/app/controllers/pay_controller.rb @@ -0,0 +1,2 @@ +class PayController < ApplicationController +end diff --git a/app/helpers/pay_helper.rb b/app/helpers/pay_helper.rb new file mode 100644 index 0000000..0af6719 --- /dev/null +++ b/app/helpers/pay_helper.rb @@ -0,0 +1,2 @@ +module PayHelper +end diff --git a/app/models/pay.rb b/app/models/pay.rb new file mode 100644 index 0000000..1e465e1 --- /dev/null +++ b/app/models/pay.rb @@ -0,0 +1,5 @@ +class Pay < ActiveRecord::Base + attr_accessible :bank_account_num, :bank_routing_num, :percent_of_deposit + belongs_to :user + +end diff --git a/app/models/user.rb b/app/models/user.rb index 05eb101..261703e 100755 --- a/app/models/user.rb +++ b/app/models/user.rb @@ -26,6 +26,7 @@ class User < ActiveRecord::Base has_one :work_info, :foreign_key => :user_id, :primary_key => :user_id, :dependent => :destroy has_many :performance, :foreign_key => :user_id, :primary_key => :user_id, :dependent => :destroy has_many :messages, :foreign_key => :receiver_id, :primary_key => :user_id, :dependent => :destroy + has_many :pay, :foreign_key => :user_id, :primary_key => :user_id, :dependent => :destroy before_create { generate_token(:auth_token) } def build_benefits_data diff --git a/app/views/layouts/shared/_sidebar.html.erb b/app/views/layouts/shared/_sidebar.html.erb index 1add2e3..19dd55e 100755 --- a/app/views/layouts/shared/_sidebar.html.erb +++ b/app/views/layouts/shared/_sidebar.html.erb @@ -65,6 +65,14 @@ Messages <% end %> + +
  • + <%= link_to "#" do %> +
    + +
    + Pay + <% end %>
    • diff --git a/app/views/sessions/new.html.erb b/app/views/sessions/new.html.erb index 816e2c3..dbeea1f 100755 --- a/app/views/sessions/new.html.erb +++ b/app/views/sessions/new.html.erb @@ -24,9 +24,8 @@ <%= link_to "Forgot Password", forgot_password_path, {:class=>"pull-left"}%>
    <%= submit_tag "Login", {:class => "btn btn-info btn-large pull-right"} %> - <%= check_box_tag :remember_me, 1, params[:remember_me], {:id => "form-terms", :class => "checkbox", :type => "checkbox"} %> - Remember - + <%= check_box_tag :remember_me, 1, params[:remember_me], {:id => "form-terms", :class => "checkbox", :type => "checkbox"} %> + Remember diff --git a/db/migrate/20140315002730_create_pays.rb b/db/migrate/20140315002730_create_pays.rb new file mode 100644 index 0000000..78a9b37 --- /dev/null +++ b/db/migrate/20140315002730_create_pays.rb @@ -0,0 +1,12 @@ +class CreatePays < ActiveRecord::Migration + def change + create_table :pays do |t| + t.integer :user_id + t.string :bank_account_num + t.string :bank_routing_num + t.integer :percent_of_deposit + + t.timestamps + end + end +end diff --git a/db/schema.rb b/db/schema.rb index 2ec1d36..a32189b 100755 --- a/db/schema.rb +++ b/db/schema.rb @@ -11,7 +11,7 @@ # # It's strongly recommended to check this file into your version control system. -ActiveRecord::Schema.define(:version => 20140312002642) do +ActiveRecord::Schema.define(:version => 20140315002730) do create_table "benefits", :force => true do |t| t.datetime "created_at", :null => false @@ -44,6 +44,15 @@ ActiveRecord::Schema.define(:version => 20140312002642) do t.datetime "updated_at", :null => false end + create_table "pays", :force => true do |t| + t.integer "user_id" + t.string "bank_account_num" + t.string "bank_routing_num" + t.integer "percent_of_deposit" + t.datetime "created_at", :null => false + t.datetime "updated_at", :null => false + end + create_table "performances", :force => true do |t| t.integer "user_id" t.date "date_submitted" diff --git a/spec/controllers/pay_controller_spec.rb b/spec/controllers/pay_controller_spec.rb new file mode 100644 index 0000000..2dc3878 --- /dev/null +++ b/spec/controllers/pay_controller_spec.rb @@ -0,0 +1,5 @@ +require 'spec_helper' + +describe PayController do + +end diff --git a/spec/helpers/pay_helper_spec.rb b/spec/helpers/pay_helper_spec.rb new file mode 100644 index 0000000..bebe4c4 --- /dev/null +++ b/spec/helpers/pay_helper_spec.rb @@ -0,0 +1,15 @@ +require 'spec_helper' + +# Specs in this file have access to a helper object that includes +# the PayHelper. For example: +# +# describe PayHelper do +# describe "string concat" do +# it "concats two strings with spaces" do +# expect(helper.concat_strings("this","that")).to eq("this that") +# end +# end +# end +describe PayHelper do + pending "add some examples to (or delete) #{__FILE__}" +end diff --git a/spec/models/pay_spec.rb b/spec/models/pay_spec.rb new file mode 100644 index 0000000..7dd47ed --- /dev/null +++ b/spec/models/pay_spec.rb @@ -0,0 +1,5 @@ +require 'spec_helper' + +describe Pay do + pending "add some examples to (or delete) #{__FILE__}" +end