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

(cherry picked from commit ce0db3d7a736e7bcde480721986dbfb4a82aa083)
This commit is contained in:
James Mason 2018-04-09 11:53:31 -07:00
parent 1fcd5c68c5
commit 26f0377c76
No known key found for this signature in database
GPG key ID: 1B3951886C449023
15 changed files with 56 additions and 10 deletions

View file

@ -52,7 +52,12 @@ module Admin
private private
def ticket_params 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 end
end end

View file

@ -57,7 +57,7 @@ class ConferenceRegistrationsController < ApplicationController
sign_in(@registration.user) sign_in(@registration.user)
end 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), redirect_to conference_tickets_path(@conference.short_title),
notice: 'You are now registered and will be receiving E-Mail notifications.' notice: 'You are now registered and will be receiving E-Mail notifications.'
else else

View file

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

View file

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

View file

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

View file

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

View file

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

View file

@ -14,5 +14,6 @@
= f.input :price = f.input :price
= f.input :price_currency, as: :select, class: 'form-control', collection: ['USD', 'EUR', 'GBP', 'INR', 'CNY', 'CHF'], include_blank: false = f.input :price_currency, as: :select, class: 'form-control', collection: ['USD', 'EUR', 'GBP', 'INR', 'CNY', 'CHF'], include_blank: false
= f.input :registration_ticket, hint: 'A registration ticket is with which user register for the conference.' = f.input :registration_ticket, hint: 'A registration ticket is with which user register for the conference.'
= f.input :visible, hint: 'Only visible tickets are available to registrants. Non-visible tickets can only be managed by Admins.'
%p.text-right %p.text-right
= f.action :submit, as: :button, button_html: { class: 'btn btn-primary' } = f.action :submit, as: :button, button_html: { class: 'btn btn-primary' }

View file

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

View file

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

View file

@ -5,7 +5,7 @@
%h1 %h1
Tickets Tickets
%p.lead %p.lead
Please choose your tickets for Please choose your tickets for
%strong %strong
= @conference.title = @conference.title
here* here*
@ -19,7 +19,7 @@
%th Price %th Price
%th Total %th Total
%tbody %tbody
- @conference.tickets.each do |ticket| - @conference.tickets.visible.each do |ticket|
= render partial: 'ticket', f: f, locals: {ticket: ticket} = render partial: 'ticket', f: f, locals: {ticket: ticket}
%tr %tr
%td %td

View file

@ -0,0 +1,11 @@
class AddVisibleToTickets < ActiveRecord::Migration[5.0]
def up
add_column :tickets, :visible, :boolean, default: true
Ticket.reset_column_information
Ticket.update_all(visible: true) # rubocop:disable Rails/SkipsModelValidations
end
def down
remove_column :tickets, :visible
end
end

View file

@ -435,7 +435,6 @@ ActiveRecord::Schema.define(version: 20181113195810) do
t.datetime "updated_at" t.datetime "updated_at"
t.boolean "include_cfp", default: false t.boolean "include_cfp", default: false
t.boolean "include_booths" t.boolean "include_booths"
t.boolean "shuffle_highlights", default: false, null: false
end end
create_table "sponsors", force: :cascade do |t| create_table "sponsors", force: :cascade do |t|
@ -530,6 +529,7 @@ ActiveRecord::Schema.define(version: 20181113195810) do
t.boolean "registration_ticket", default: false t.boolean "registration_ticket", default: false
t.datetime "created_at" t.datetime "created_at"
t.datetime "updated_at" t.datetime "updated_at"
t.boolean "visible", default: true
end end
create_table "tracks", force: :cascade do |t| create_table "tracks", force: :cascade do |t|

View file

@ -5,6 +5,7 @@ FactoryBot.define do
title { "#{Faker::Hipster.word} Ticket" } title { "#{Faker::Hipster.word} Ticket" }
price_cents { 1000 } price_cents { 1000 }
price_currency { 'USD' } price_currency { 'USD' }
visible { true }
factory :registration_ticket do factory :registration_ticket do
registration_ticket { true } registration_ticket { true }
end end

View file

@ -43,6 +43,22 @@ feature Ticket do
expect(Ticket.count).to eq(1) expect(Ticket.count).to eq(1)
end end
scenario 'add a hidden ticket', feature: true do
visit admin_conference_tickets_path(conference.short_title)
click_link 'Add Ticket'
fill_in 'ticket_title', with: 'Hidden Ticket'
fill_in 'ticket_description', with: 'The hidden ticket'
fill_in 'ticket_price', with: '100'
uncheck 'ticket_visible'
click_button 'Create Ticket'
page.find('#flash')
expect(flash).to eq('Ticket successfully created.')
expect(Ticket.count).to eq(2)
expect(Ticket.visible.count).to eq(1)
end
context 'Ticket already created' do context 'Ticket already created' do
let!(:ticket) { create(:ticket, title: 'Business Ticket', price: 100, conference_id: conference.id) } let!(:ticket) { create(:ticket, title: 'Business Ticket', price: 100, conference_id: conference.id) }