From 86cab52f52cf72fa91d7815bba90e8274ce5c536 Mon Sep 17 00:00:00 2001 From: ViditChitkara Date: Sat, 23 Dec 2017 17:06:54 +0530 Subject: [PATCH 1/5] fixed ticket turnover bug closes #1918 --- app/models/ticket.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/models/ticket.rb b/app/models/ticket.rb index b49cf1b9..fdac09bf 100644 --- a/app/models/ticket.rb +++ b/app/models/ticket.rb @@ -62,7 +62,7 @@ class Ticket < ApplicationRecord def tickets_turnover_total(id) tickets = TicketPurchase.where(ticket_id: id).paid - tickets.inject(0){ |sum, ticket| sum + (ticket.amount_paid * ticket.quantity) } + tickets.inject(Money.new(0,tickets.first.price_currency)){ |sum, ticket| sum + (ticket.amount_paid * ticket.quantity) } end def tickets_sold From 0ec937e43e56fef8ccbae74472e2b52768ffbf21 Mon Sep 17 00:00:00 2001 From: ViditChitkara Date: Sat, 23 Dec 2017 18:34:26 +0530 Subject: [PATCH 2/5] fixed failing tests --- app/models/ticket.rb | 6 +++++- db/schema.rb | 2 +- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/app/models/ticket.rb b/app/models/ticket.rb index fdac09bf..d9723a2b 100644 --- a/app/models/ticket.rb +++ b/app/models/ticket.rb @@ -62,7 +62,11 @@ class Ticket < ApplicationRecord def tickets_turnover_total(id) tickets = TicketPurchase.where(ticket_id: id).paid - tickets.inject(Money.new(0,tickets.first.price_currency)){ |sum, ticket| sum + (ticket.amount_paid * ticket.quantity) } + if tickets.nil? + tickets.inject(Money.new(0, tickets.first.price_currency)){ |sum, ticket| sum + (ticket.amount_paid * ticket.quantity) } + else + Money.new(0, Ticket.find(id).price_currency) + end end def tickets_sold diff --git a/db/schema.rb b/db/schema.rb index ed33d5a3..48815a8a 100644 --- a/db/schema.rb +++ b/db/schema.rb @@ -496,7 +496,7 @@ ActiveRecord::Schema.define(version: 20171201163628) do t.integer "user_id" t.integer "payment_id" t.integer "week" - t.float "amount_paid" + t.float "amount_paid", default: 0.0 end create_table "ticket_scannings", force: :cascade do |t| From 6d67e9c959ce3c030239b3dd642c733fad31e336 Mon Sep 17 00:00:00 2001 From: ViditChitkara Date: Sat, 23 Dec 2017 18:41:10 +0530 Subject: [PATCH 3/5] minor changes --- app/models/ticket.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/models/ticket.rb b/app/models/ticket.rb index d9723a2b..19f2f2f4 100644 --- a/app/models/ticket.rb +++ b/app/models/ticket.rb @@ -62,7 +62,7 @@ class Ticket < ApplicationRecord def tickets_turnover_total(id) tickets = TicketPurchase.where(ticket_id: id).paid - if tickets.nil? + unless tickets. blank? tickets.inject(Money.new(0, tickets.first.price_currency)){ |sum, ticket| sum + (ticket.amount_paid * ticket.quantity) } else Money.new(0, Ticket.find(id).price_currency) From 66a2777677284f7976f601bc46c7a9780b7779b0 Mon Sep 17 00:00:00 2001 From: ViditChitkara Date: Tue, 2 Jan 2018 19:29:28 +0530 Subject: [PATCH 4/5] changes for test faliures --- app/models/ticket.rb | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/app/models/ticket.rb b/app/models/ticket.rb index 19f2f2f4..80e7f3e0 100644 --- a/app/models/ticket.rb +++ b/app/models/ticket.rb @@ -62,10 +62,10 @@ class Ticket < ApplicationRecord def tickets_turnover_total(id) tickets = TicketPurchase.where(ticket_id: id).paid - unless tickets. blank? - tickets.inject(Money.new(0, tickets.first.price_currency)){ |sum, ticket| sum + (ticket.amount_paid * ticket.quantity) } - else + if tickets.blank? Money.new(0, Ticket.find(id).price_currency) + else + tickets.inject(Money.new(0, tickets.first.price_currency)){ |sum, ticket| sum + (ticket.amount_paid * ticket.quantity) } end end From ed21986cf1cb676af52715dc59cd83ac35933c1a Mon Sep 17 00:00:00 2001 From: AnkushMalik Date: Thu, 25 Jan 2018 09:09:18 +0530 Subject: [PATCH 5/5] Fix oauth btn alignment Use flex for alignment of btn grp Closes #1931 --- app/assets/stylesheets/osem.scss | 6 ++++++ app/views/devise/shared/_openid_links.html.haml | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/app/assets/stylesheets/osem.scss b/app/assets/stylesheets/osem.scss index bbcabc44..7d0d0519 100644 --- a/app/assets/stylesheets/osem.scss +++ b/app/assets/stylesheets/osem.scss @@ -115,3 +115,9 @@ p.comment-body { float: right; } } + +/* omniauth btn grp */ +#openid-btn-grp{ + display: flex; + justify-content: center; +} \ No newline at end of file diff --git a/app/views/devise/shared/_openid_links.html.haml b/app/views/devise/shared/_openid_links.html.haml index 8bcc96da..09c7a7ea 100644 --- a/app/views/devise/shared/_openid_links.html.haml +++ b/app/views/devise/shared/_openid_links.html.haml @@ -1,5 +1,5 @@ .text-center - .btn-group.btn-group-lg + .btn-group.btn-group-lg#openid-btn-grp - omniauth_configured.each do |provider| = link_to "user_#{provider}_omniauth_authorize".to_sym, class: "btn btn-success btn-lg", id: "omniauth-#{provider}",