From a9ab1186f80f115f93b3e733580149e87adf0462 Mon Sep 17 00:00:00 2001 From: Rishabh Saxena Date: Fri, 5 Aug 2016 20:17:27 +0530 Subject: [PATCH] change rails initialisation. repair abilities. add ticket purchasing check. --- app/assets/images/OSEM_ICON.jpg | Bin 22855 -> 0 bytes app/controllers/payments_controller.rb | 4 ++-- app/controllers/ticket_purchases_controller.rb | 6 ++++-- app/models/ability.rb | 2 +- .../conference_registrations/show.html.haml | 2 +- app/views/payments/_payment.html.haml | 2 +- app/views/tickets/index.html.haml | 2 +- config/initializers/stripe.rb | 7 +------ spec/models/ability_spec.rb | 3 +++ 9 files changed, 14 insertions(+), 14 deletions(-) delete mode 100644 app/assets/images/OSEM_ICON.jpg diff --git a/app/assets/images/OSEM_ICON.jpg b/app/assets/images/OSEM_ICON.jpg deleted file mode 100644 index 6a52c3b0e2378b6575023f691b6f9ed0e8b5abac..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 22855 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 Y4dbQClVxI@$6kZHdGG(1Pxx*0A1vXuj{pDw diff --git a/app/controllers/payments_controller.rb b/app/controllers/payments_controller.rb index 121e0c4b..d637f1f5 100644 --- a/app/controllers/payments_controller.rb +++ b/app/controllers/payments_controller.rb @@ -21,8 +21,8 @@ class PaymentsController < ApplicationController if @payment.purchase && @payment.save update_purchased_ticket_purchases - redirect_to conference_conference_registration_path(@conference.short_title), flash: - { success: 'Thanks! You have purchased your tickets successfully.' } + redirect_to conference_conference_registration_path(@conference.short_title), + notice: 'Thanks! You have purchased your tickets successfully.' else @total_amount_to_pay = Ticket.total_price(@conference, current_user, paid: false) @unpaid_ticket_purchases = current_user.ticket_purchases.unpaid.by_conference(@conference) diff --git a/app/controllers/ticket_purchases_controller.rb b/app/controllers/ticket_purchases_controller.rb index 43f6d09a..4a334a08 100644 --- a/app/controllers/ticket_purchases_controller.rb +++ b/app/controllers/ticket_purchases_controller.rb @@ -8,9 +8,11 @@ class TicketPurchasesController < ApplicationController message = TicketPurchase.purchase(@conference, current_user, params[:tickets][0]) if message.blank? if current_user.ticket_purchases.by_conference(@conference).unpaid.any? - redirect_to new_conference_payment_path, notice: 'Please pay here to purchase tickets.' + redirect_to new_conference_payment_path, + notice: 'Please pay here to purchase tickets.' else - redirect_to conference_conference_registration_path(@conference.short_title) + redirect_to conference_tickets_path(@conference.short_title), + error: 'Please purchase atleast one ticket to continue.' end else redirect_to conference_conference_registration_path(@conference.short_title), diff --git a/app/models/ability.rb b/app/models/ability.rb index 74b1e47d..d986c1b0 100644 --- a/app/models/ability.rb +++ b/app/models/ability.rb @@ -81,7 +81,7 @@ class Ability can :index, Ticket can :manage, TicketPurchase, user_id: user.id - can [:new], Payment, user_id: user.id + can [:new, :create], Payment, user_id: user.id can [:create, :destroy], Subscription, user_id: user.id diff --git a/app/views/conference_registrations/show.html.haml b/app/views/conference_registrations/show.html.haml index 24923d07..9debda28 100644 --- a/app/views/conference_registrations/show.html.haml +++ b/app/views/conference_registrations/show.html.haml @@ -109,7 +109,7 @@ You haven't bought any tickets. = link_to 'Please buy some tickets to support us!', conference_tickets_path(@conference.short_title) %p - (Your registration won't be complete without buying a ticket) + (Your participation won't be valid without buying a ticket) .row .col-md-12 diff --git a/app/views/payments/_payment.html.haml b/app/views/payments/_payment.html.haml index a8de023f..953d8334 100644 --- a/app/views/payments/_payment.html.haml +++ b/app/views/payments/_payment.html.haml @@ -26,8 +26,8 @@ = humanized_money_with_symbol @total_amount_to_pay %script.stripe-button{ src: "https://checkout.stripe.com/checkout.js", data: { amount: @total_amount_to_pay.cents, + email: current_user.email, currency: @total_amount_to_pay.currency, - image: image_url('OSEM_ICON.jpg'), name: ENV['OSEM_NAME'] || 'OSEM', description: "book your tickets", key: Rails.application.secrets.stripe_publishable_key, diff --git a/app/views/tickets/index.html.haml b/app/views/tickets/index.html.haml index 8f80e1ac..f9fa9a5e 100644 --- a/app/views/tickets/index.html.haml +++ b/app/views/tickets/index.html.haml @@ -42,4 +42,4 @@ .col-md-13 %p.text-muted.text-center %small - * Buying a ticket is mandatory. Your registration will not complete until you buy a ticket. + * Buying a ticket is mandatory. Your participation will not be valid until you buy a ticket. diff --git a/config/initializers/stripe.rb b/config/initializers/stripe.rb index 22ff8359..fe10a25c 100644 --- a/config/initializers/stripe.rb +++ b/config/initializers/stripe.rb @@ -1,6 +1 @@ -Rails.configuration.stripe = { - :publishable_key => ENV['STRIPE_PUBLISHABLE_KEY'] || Rails.application.secrets.stripe_publishable_key, - :secret_key => ENV['STRIPE_SECRET_KEY'] || Rails.application.secrets.stripe_secret_key -} - -Stripe.api_key = Rails.configuration.stripe[:secret_key] +Stripe.api_key = Rails.application.secret.stripe_secret_key diff --git a/spec/models/ability_spec.rb b/spec/models/ability_spec.rb index 720aec33..df12e8b9 100644 --- a/spec/models/ability_spec.rb +++ b/spec/models/ability_spec.rb @@ -105,6 +105,9 @@ describe 'User' do it{ should be_able_to(:index, Ticket) } it{ should be_able_to(:manage, TicketPurchase.new(user_id: user.id)) } + it{ should be_able_to(:new, Payment.new(user_id: user.id)) } + it{ should be_able_to(:create, Payment.new(user_id: user.id)) } + it{ should be_able_to(:create, Subscription.new(user_id: user.id)) } it{ should be_able_to(:destroy, subscription) }