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

[fix] Fix user.count_registration_tickets

Browse source
This commit is contained in:
Jimmy 2021-03-04 15:34:06 -08:00
parent b72dfdabf8
commit 189c2ec75f
2 changed files with 1 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

1
app/controllers/ticket_purchases_controller.rb
View file

@ -47,7 +47,6 @@ class TicketPurchasesController < ApplicationController
# Current user didn't have a registration ticket and is purchasing one # Current user 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 == 0 && count_registration_tickets_after == 1
redirect_to new_conference_conference_registration_path(@conference.short_title) redirect_to new_conference_conference_registration_path(@conference.short_title)
else else
redirect_to conference_physical_tickets_path redirect_to conference_physical_tickets_path
end end

2
app/models/user.rb
View file

@ -348,7 +348,7 @@ class User < ApplicationRecord
def count_registration_tickets(conference) def count_registration_tickets(conference)
count = 0 count = 0
for ticket_purchase in current_user.ticket_purchases.by_conference(@conference) for ticket_purchase in ticket_purchases.by_conference(conference)
for physical_ticket in ticket_purchase.physical_tickets for physical_ticket in ticket_purchase.physical_tickets
if physical_ticket.ticket.registration_ticket if physical_ticket.ticket.registration_ticket
count += 1 count += 1