Add (admin-only) tickets via 'visibile' attribute [migration]

(cherry picked from commit ce0db3d7a736e7bcde480721986dbfb4a82aa083)

app/controllers/admin/tickets_controller.rb

@@ -52,7 +52,12 @@ module Admin
     private
 
     def ticket_params
-      params.require(:ticket).permit(:conference, :title, :url, :description, :conference_id, :price_cents, :price_currency, :price, :registration_ticket)
+      params.require(:ticket).permit(
+        :conference, :conference_id,
+        :title, :url, :description,
+        :price_cents, :price_currency, :price,
+        :registration_ticket, :visible
+      )
     end
   end
 end

app/controllers/conference_registrations_controller.rb

@@ -57,7 +57,7 @@ class ConferenceRegistrationsController < ApplicationController
         sign_in(@registration.user)
       end
 
-      if @conference.tickets.any? && !current_user.supports?(@conference)
+      if @conference.tickets.visible.any? && !current_user.supports?(@conference)
         redirect_to conference_tickets_path(@conference.short_title),
                     notice: 'You are now registered and will be receiving E-Mail notifications.'
       else

app/controllers/conferences_controller.rb

@@ -54,7 +54,7 @@ class ConferencesController < ApplicationController
       end
     end
     if splashpage.include_registrations || splashpage.include_tickets
-      @tickets = @conference.tickets.order(:price_cents)
+      @tickets = @conference.tickets.visible.order('price_cents')
     end
     if splashpage.include_lodgings
       @lodgings = @conference.lodgings.order(:name)

app/controllers/tickets_controller.rb

@@ -3,7 +3,8 @@
 class TicketsController < ApplicationController
   before_action :authenticate_user!
   load_resource :conference, find_by: :short_title
-  load_resource :ticket, through: :conference
+  before_action :load_tickets
+  authorize_resource :ticket, through: :conference
   authorize_resource :conference_registrations, class: Registration
   before_action :check_load_resource, only: :index
 
@@ -14,4 +15,8 @@ class TicketsController < ApplicationController
       redirect_to root_path, notice: "There are no tickets available for #{@conference.title}!"
     end
   end
+
+  def load_tickets
+    @tickets = @conference.tickets.visible
+  end
 end

app/models/ability.rb

@@ -85,7 +85,10 @@ class Ability
       end
     end
 
-    can :index, Ticket
+    can :index, Organization
+    can :index, Ticket do |ticket|
+      ticket.visible
+    end
     can :manage, TicketPurchase, user_id: user.id
     can [:new, :create], Payment, user_id: user.id
     can [:index, :show], PhysicalTicket, user: user

app/models/ticket.rb

@@ -20,6 +20,8 @@ class Ticket < ApplicationRecord
 
   validates :price_cents, numericality: { greater_than_or_equal_to: 0 }
 
+  scope :visible, -> { where(visible: true) }
+
   def bought?(user)
     buyers.include?(user)
   end

app/models/ticket_purchase.rb

@@ -32,7 +32,7 @@ class TicketPurchase < ApplicationRecord
       errors.push('You cannot buy more than one registration tickets.')
     else
       ActiveRecord::Base.transaction do
-        conference.tickets.each do |ticket|
+        conference.tickets.visible.each do |ticket|
           quantity = purchases[ticket.id.to_s].to_i
           # if the user bought the ticket and is still unpaid, just update the quantity
           purchase = if ticket.bought?(user) && ticket.unpaid?(user)

app/views/admin/tickets/_form.html.haml

@@ -1,3 +1,4 @@
+<<<<<<< HEAD
 = form_for(@ticket, url: (@ticket.new_record? ? admin_conference_tickets_path : admin_conference_ticket_path(@conference.short_title, @ticket))) do |f|
   .form-group
     = f.label :title
@@ -21,5 +22,8 @@
     %label
       = f.check_box :registration_ticket
       A registration ticket is with which user register for the conference.
+    %label
+      = f.check_box :visible
+      Only visible tickets are available to registrants. Non-visible tickets can only be managed by Admins.
   %p.text-right
     = f.submit nil, class: 'btn btn-primary'

app/views/admin/tickets/index.html.haml

@@ -16,6 +16,7 @@
             %th Sold
             %th Turnover
             %th Registration Ticket
+            %th Visible?
             %th Actions
         %tbody
           - @conference.tickets.each do |ticket|
@@ -31,6 +32,8 @@
                 = humanized_money_with_symbol ticket.tickets_turnover_total(ticket.id)
               %td
                 = ticket.registration_ticket? ? 'Yes' : 'No'
+              %td
+                = ticket.visible? ? 'Yes' : 'No'
               %td
                 .btn-group
                   = link_to 'Edit', edit_admin_conference_ticket_path(@conference.short_title, ticket.id),

app/views/conference_registrations/show.html.haml

@@ -74,7 +74,7 @@
               = link_to event.title, conference_program_proposal_path(@conference.short_title, event.id)
               = '(' + registered_text(event) + ')'
 
-  - if @conference.tickets.any?
+  - if @conference.tickets.visible.any?
     .row
       .col-md-12
         %h4

app/views/tickets/index.html.haml

@@ -19,8 +19,8 @@
               %th Price
               %th Total
           %tbody
-          - @conference.tickets.each do |ticket|
-            = render 'ticket', f: f, ticket: ticket
+          - @conference.tickets.visible.each do |ticket|
+            = render partial: 'ticket', f: f, locals: {ticket: ticket}
           %tr
             %td
             - if @conference.tickets.for_registration.any?