gunghogeoduck/osem-fcy
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

use short-form presence validator.

Browse source 
use two-argument form.
add unpaid scope.
repair tests.
This commit is contained in:
Rishabh Saxena 2016-07-08 23:07:17 +05:30
parent 893f517ab0
commit 888c7a8524
6 changed files with 24 additions and 36 deletions
Download patch file Download diff file Expand all files Collapse all files

2
app/controllers/conference_registrations_controller.rb
View file

@ -28,7 +28,7 @@ class ConferenceRegistrationsController < ApplicationController
end
def show
@total_price = Ticket.total_price(@conference, current_user, :paid => true)
@total_price = Ticket.total_price(@conference, current_user, paid: true)
@tickets = current_user.ticket_purchases.where(conference_id: @conference.id, paid: true)
@ticket_payments = @tickets.group_by(&:payment_id)
end

2
app/controllers/ticket_purchases_controller.rb
View file

@ -7,7 +7,7 @@ class TicketPurchasesController < ApplicationController
TicketPurchase.destroy_all(user_id: current_user.id, conference_id: @conference.id, paid: false)
message = TicketPurchase.purchase(@conference, current_user, params[:tickets][0])
if message.blank?
if current_user.ticket_purchases.where(paid: false).any?
if current_user.ticket_purchases.unpaid.any?
redirect_to new_conference_payment_path, notice: 'Please pay here to purchase tickets.'
else
redirect_to conference_conference_registration_path(@conference.short_title)