diff --git a/app/views/admin/registration_periods/show.html.haml b/app/views/admin/registration_periods/show.html.haml index e923d089..48d49684 100644 --- a/app/views/admin/registration_periods/show.html.haml +++ b/app/views/admin/registration_periods/show.html.haml @@ -25,12 +25,12 @@ = link_to 'Delete', admin_conference_registration_period_path, method: :delete, data: { confirm: 'Are you sure?' }, class: 'btn btn-danger' - else - - unless @conference.tickets.for_registration.empty? - - if can? :create, @conference.build_registration_period - = link_to 'New Registration Period', new_admin_conference_registration_period_path, class: 'btn btn-primary' - - else - .h3.text-left + - if @conference.tickets.for_registration.empty? + h3.text-left No Registration Tickets! %small = link_to 'Create registration tickets', new_admin_conference_ticket_path before creating the registration period. + - else + if can? :create, @conference.build_registration_period + = link_to 'New Registration Period', new_admin_conference_registration_period_path, class: 'btn btn-primary' \ No newline at end of file diff --git a/spec/models/ticket_spec.rb b/spec/models/ticket_spec.rb index 543e9aaf..dd97243c 100644 --- a/spec/models/ticket_spec.rb +++ b/spec/models/ticket_spec.rb @@ -192,7 +192,7 @@ describe Ticket do end end - describe 'currency updation' do + describe 'currency update' do context 'when more than one ticket exist for a conference' do it 'should not allow currency update' do ticket.update(price_currency: 'INR')