remove stripe#customer creation.
remove amount validation.
This commit is contained in:
parent
112d2c6fff
commit
72ef33cbe6
5 changed files with 5 additions and 26 deletions
|
|
@ -14,11 +14,8 @@ class PaymentsController < ApplicationController
|
||||||
end
|
end
|
||||||
|
|
||||||
def create
|
def create
|
||||||
@total_amount_to_pay = Ticket.total_price(@conference, current_user, paid: false)
|
|
||||||
|
|
||||||
@payment = Payment.new payment_params.merge(stripe_customer_email: params[:stripeEmail],
|
@payment = Payment.new payment_params.merge(stripe_customer_email: params[:stripeEmail],
|
||||||
stripe_customer_token: params[:stripeToken],
|
stripe_customer_token: params[:stripeToken],
|
||||||
amount: @total_amount_to_pay.cents,
|
|
||||||
user: current_user,
|
user: current_user,
|
||||||
conference: @conference)
|
conference: @conference)
|
||||||
|
|
||||||
|
|
@ -27,6 +24,7 @@ class PaymentsController < ApplicationController
|
||||||
redirect_to conference_conference_registration_path(@conference.short_title), flash:
|
redirect_to conference_conference_registration_path(@conference.short_title), flash:
|
||||||
{ success: 'Thanks! You have purchased your tickets successfully.' }
|
{ success: 'Thanks! You have purchased your tickets successfully.' }
|
||||||
else
|
else
|
||||||
|
@total_amount_to_pay = Ticket.total_price(@conference, current_user, paid: false)
|
||||||
@unpaid_ticket_purchases = current_user.ticket_purchases.unpaid.by_conference(@conference)
|
@unpaid_ticket_purchases = current_user.ticket_purchases.unpaid.by_conference(@conference)
|
||||||
render :new
|
render :new
|
||||||
end
|
end
|
||||||
|
|
|
||||||
|
|
@ -7,7 +7,6 @@ class Payment < ActiveRecord::Base
|
||||||
attr_accessor :stripe_customer_token
|
attr_accessor :stripe_customer_token
|
||||||
|
|
||||||
validates :status, presence: true
|
validates :status, presence: true
|
||||||
validates :amount, presence: true, numericality: { greater_than: 0 }
|
|
||||||
validates :user_id, presence: true
|
validates :user_id, presence: true
|
||||||
validates :conference_id, presence: true
|
validates :conference_id, presence: true
|
||||||
|
|
||||||
|
|
@ -22,13 +21,9 @@ class Payment < ActiveRecord::Base
|
||||||
end
|
end
|
||||||
|
|
||||||
def purchase
|
def purchase
|
||||||
customer = Stripe::Customer.create email: stripe_customer_email,
|
gateway_response = Stripe::Charge.create source: stripe_customer_token,
|
||||||
source: stripe_customer_token,
|
|
||||||
description: user.name
|
|
||||||
|
|
||||||
gateway_response = Stripe::Charge.create customer: customer.id,
|
|
||||||
receipt_email: stripe_customer_email,
|
receipt_email: stripe_customer_email,
|
||||||
description: 'ticket purchases',
|
description: "ticket purchases(#{user.username})",
|
||||||
amount: amount_to_pay,
|
amount: amount_to_pay,
|
||||||
currency: conference.tickets.first.price_currency
|
currency: conference.tickets.first.price_currency
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -2,7 +2,7 @@ class CreatePayments < ActiveRecord::Migration
|
||||||
def change
|
def change
|
||||||
create_table :payments do |t|
|
create_table :payments do |t|
|
||||||
t.string :last4
|
t.string :last4
|
||||||
t.integer :amount, null: false
|
t.integer :amount
|
||||||
t.string :authorization_code
|
t.string :authorization_code
|
||||||
t.integer :status, default: 0, null: false
|
t.integer :status, default: 0, null: false
|
||||||
t.integer :user_id, null: false
|
t.integer :user_id, null: false
|
||||||
|
|
|
||||||
|
|
@ -265,7 +265,7 @@ ActiveRecord::Schema.define(version: 20160704092023) do
|
||||||
|
|
||||||
create_table "payments", force: :cascade do |t|
|
create_table "payments", force: :cascade do |t|
|
||||||
t.string "last4"
|
t.string "last4"
|
||||||
t.integer "amount", null: false
|
t.integer "amount"
|
||||||
t.string "authorization_code"
|
t.string "authorization_code"
|
||||||
t.integer "status", default: 0, null: false
|
t.integer "status", default: 0, null: false
|
||||||
t.integer "user_id", null: false
|
t.integer "user_id", null: false
|
||||||
|
|
|
||||||
|
|
@ -14,25 +14,11 @@ describe Payment do
|
||||||
expect(build(:payment)).to be_valid
|
expect(build(:payment)).to be_valid
|
||||||
end
|
end
|
||||||
|
|
||||||
it { is_expected.to validate_presence_of(:amount) }
|
|
||||||
|
|
||||||
it { is_expected.to validate_presence_of(:status) }
|
it { is_expected.to validate_presence_of(:status) }
|
||||||
|
|
||||||
it { is_expected.to validate_presence_of(:user_id) }
|
it { is_expected.to validate_presence_of(:user_id) }
|
||||||
|
|
||||||
it { is_expected.to validate_presence_of(:conference_id) }
|
it { is_expected.to validate_presence_of(:conference_id) }
|
||||||
|
|
||||||
it 'is not valid with a amount equals zero' do
|
|
||||||
should_not allow_value(0).for(:amount)
|
|
||||||
end
|
|
||||||
|
|
||||||
it 'is not valid with a amount smaller than zero' do
|
|
||||||
should_not allow_value(-1).for(:amount)
|
|
||||||
end
|
|
||||||
|
|
||||||
it 'is valid with a amount greater than zero' do
|
|
||||||
should allow_value(1).for(:amount)
|
|
||||||
end
|
|
||||||
end
|
end
|
||||||
|
|
||||||
describe '#amount_to_pay' do
|
describe '#amount_to_pay' do
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue