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

[test] Fix style; add test for user#count_registration_tickets

Browse source
This commit is contained in:
Jimmy 2021-03-09 18:25:15 -08:00
parent 6e3cdc2614
commit 11a4d200f7
3 changed files with 13 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

2
app/controllers/payments_controller.rb
View file

@ -34,8 +34,6 @@ class PaymentsController < ApplicationController
redirect_to conference_physical_tickets_path,
notice: 'Thanks! Your ticket is booked successfully.'
end
@has_registration_ticket = nil
else
@total_amount_to_pay = Ticket.total_price(@conference, current_user, paid: false)
@unpaid_ticket_purchases = current_user.ticket_purchases.unpaid.by_conference(@conference)

4
app/controllers/ticket_purchases_controller.rb
View file

@ -31,14 +31,14 @@ class TicketPurchasesController < ApplicationController
# User needs to pay for tickets if any of them is not free.
if current_user.ticket_purchases.by_conference(@conference).unpaid.any?
has_registration_ticket = count_registration_tickets_before == 0 && count_registration_tickets_after == 1
has_registration_ticket = count_registration_tickets_before.zero? && count_registration_tickets_after == 1
redirect_to new_conference_payment_path(has_registration_ticket: has_registration_ticket),
notice: 'Please pay here to get tickets.'
return
end
# Redirect to registration page for a user who didn't have a registration ticket and is purchasing one
if count_registration_tickets_before == 0 && count_registration_tickets_after == 1
if count_registration_tickets_before.zero? && count_registration_tickets_after == 1
redirect_to new_conference_conference_registration_path(@conference.short_title),
notice: 'Thanks! Your ticket is booked successfully. Please register for the conference.'
else