From c0c84b9dbf3a4fd0798caf0478b28b761742aca9 Mon Sep 17 00:00:00 2001
From: Rishabh Saxena <orishabh1@gmail.com>
Date: Tue, 5 Jul 2016 16:39:38 +0530
Subject: [PATCH] add more explanatory true/false values

---
 .../conference_registrations_controller.rb     |  3 +--
 app/controllers/payments_controller.rb         | 18 ++++++++----------
 app/controllers/ticket_purchases_controller.rb |  4 ++--
 app/models/ticket_purchase.rb                  |  6 +++---
 4 files changed, 14 insertions(+), 17 deletions(-)

diff --git a/app/controllers/conference_registrations_controller.rb b/app/controllers/conference_registrations_controller.rb
index 441c2738..798a1586 100644
--- a/app/controllers/conference_registrations_controller.rb
+++ b/app/controllers/conference_registrations_controller.rb
@@ -28,8 +28,7 @@ class ConferenceRegistrationsController < ApplicationController
   end
 
   def show
-    TicketPurchase.destroy_all(user_id: current_user.id, conference_id: @conference.id, paid: 'f')
-    @total_price = Ticket.total_price(@conference, current_user, 't')
+    @total_price = Ticket.total_price(@conference, current_user, true)
     @tickets = current_user.ticket_purchases.where(conference_id: @conference.id)
     @ticket_payments = @tickets.group_by(&:payment_id)
   end
diff --git a/app/controllers/payments_controller.rb b/app/controllers/payments_controller.rb
index a60437a8..1ae8d8d9 100644
--- a/app/controllers/payments_controller.rb
+++ b/app/controllers/payments_controller.rb
@@ -9,22 +9,20 @@ class PaymentsController < ApplicationController
   end
 
   def new
-    @total_amount_to_pay = Ticket.total_price(@conference, current_user, 'f')
+    @total_amount_to_pay = Ticket.total_price(@conference, current_user, false)
   end
 
   def create
     @payment = Payment.new(payment_params)
-    @total_amount_to_pay = Ticket.total_price(@conference, current_user, 'f')
+    @total_amount_to_pay = Ticket.total_price(@conference, current_user, false)
 
     if @payment.valid? && @payment.purchase(current_user, @conference, price_in_cents)
-      @payment.save
-      @update_ticket_purchases = TicketPurchase.update_paid_ticket_purchases(@conference, current_user, @payment)
-    end
-
-    if @payment.save
-      redirect_to conference_conference_registrations_path(@conference.short_title), flash: { success: 'Thanks! You have purchased your tickets successfully.' }
-    else
-      render 'new'
+      if @payment.save
+        @update_ticket_purchases = TicketPurchase.update_paid_ticket_purchases(@conference, current_user, @payment)
+        redirect_to conference_conference_registrations_path(@conference.short_title), flash: { success: 'Thanks! You have purchased your tickets successfully.' }
+      else
+        render 'new'
+      end
     end
   end
 
diff --git a/app/controllers/ticket_purchases_controller.rb b/app/controllers/ticket_purchases_controller.rb
index a921839e..8a5084fc 100644
--- a/app/controllers/ticket_purchases_controller.rb
+++ b/app/controllers/ticket_purchases_controller.rb
@@ -4,10 +4,10 @@ class TicketPurchasesController < ApplicationController
   authorize_resource :conference_registrations, class: Registration
 
   def create
-    TicketPurchase.destroy_all(user_id: current_user.id, conference_id: @conference.id, paid: 'f')
+    TicketPurchase.destroy_all(user_id: current_user.id, conference_id: @conference.id, paid: false)
     message = TicketPurchase.purchase(@conference, current_user, params[:tickets][0])
     if message.blank?
-      if current_user.ticket_purchases.where(paid: 'f').any?
+      if current_user.ticket_purchases.where(paid: false).any?
         redirect_to new_conference_payment_path, notice: 'Please pay here to purchase tickets.'
       else
         redirect_to conference_conference_registration_path(@conference.short_title)
diff --git a/app/models/ticket_purchase.rb b/app/models/ticket_purchase.rb
index 8fbc9c49..fd30a2d1 100644
--- a/app/models/ticket_purchase.rb
+++ b/app/models/ticket_purchase.rb
@@ -45,7 +45,7 @@ class TicketPurchase < ActiveRecord::Base
     purchase = TicketPurchase.where(ticket_id: ticket.id,
                                     conference_id: conference.id,
                                     user_id: user.id,
-                                    paid: 'f').first
+                                    paid: false).first
 
     purchase.quantity = quantity if quantity > 0
     purchase
@@ -54,10 +54,10 @@ class TicketPurchase < ActiveRecord::Base
   def self.update_paid_ticket_purchases(conference, user, payment)
     paid_ticket_purchases = TicketPurchase.where(conference_id: conference.id,
                                                  user_id: user.id,
-                                                 paid: 'f')
+                                                 paid: false)
     begin
       paid_ticket_purchases.each do |ticket|
-        ticket.paid = 't' 
+        ticket.paid = true
         ticket.payment_id = payment.id
         ticket.save
       end