Merge branch 'master' into openshift_compatibility

app/assets/javascripts/osem-tickets.js

@@ -11,7 +11,7 @@ function update_price($this){
     $('.total_row').each(function( index ) {
         total += parseFloat($(this).text());
     });
-    $('#total_price').text(total);
+    $('#total_price').text(total.toFixed(2));
 }
 
 $( document ).ready(function() {

app/controllers/conference_registrations_controller.rb

@@ -27,8 +27,9 @@ class ConferenceRegistrationsController < ApplicationController
   end
 
   def show
-    @total_price = Ticket.total_price(@conference, current_user, paid: true)
+    @total_price = Ticket.total_price_user(@conference, current_user, paid: true)
     @tickets = current_user.ticket_purchases.by_conference(@conference).paid
+    @total_price_per_ticket = @tickets.group(:ticket_id).sum('amount_paid * quantity')
     @ticket_payments = @tickets.group_by(&:ticket_id)
     @total_quantity = @tickets.group(:ticket_id).sum(:quantity)
   end

app/models/conference.rb

@@ -496,7 +496,7 @@ class Conference < ActiveRecord::Base
     if tickets && ticket_purchases
       tickets.each do |ticket|
         result[ticket.title] = {
-          'value' => ApplicationController.helpers.humanized_money(ticket.tickets_turnover).delete(',').to_i,
+          'value' => ApplicationController.helpers.humanized_money(ticket.tickets_turnover_total(ticket.id)).delete(',').to_i,
           'color' => "\##{Digest::MD5.hexdigest(ticket.title)[0..5]}"
         }
       end

app/models/ticket.rb

@@ -55,12 +55,18 @@ class Ticket < ActiveRecord::Base
     result ? result : Money.new(0, 'USD')
   end
 
-  def tickets_sold
-    ticket_purchases.paid.sum(:quantity)
+  def self.total_price_user(conference, user, paid: false)
+    tickets = TicketPurchase.where(conference: conference, user: user, paid: paid)
+    tickets.inject(0){ |sum, ticket| sum + (ticket.amount_paid * ticket.quantity) }
   end
 
-  def tickets_turnover
-    tickets_sold * price
+  def tickets_turnover_total(id)
+    tickets = TicketPurchase.where(ticket_id: id)
+    tickets.inject(0){ |sum, ticket| sum + (ticket.amount_paid * ticket.quantity) }
+  end
+
+  def tickets_sold
+    ticket_purchases.paid.sum(:quantity)
   end
 
   private

app/models/ticket_purchase.rb

@@ -52,7 +52,8 @@ class TicketPurchase < ActiveRecord::Base
       purchase = new(ticket_id: ticket.id,
                      conference_id: conference.id,
                      user_id: user.id,
-                     quantity: quantity)
+                     quantity: quantity,
+                     amount_paid: ticket.price)
       purchase.pay(nil) if ticket.price_cents.zero?
     end
     purchase

app/views/admin/physical_tickets/_physical_ticket.html.haml

@@ -0,0 +1,16 @@
+%tr
+  %td= physical_ticket.id
+  %td= physical_ticket.ticket.title
+  %td= physical_ticket.user.email
+  %td= humanized_money_with_symbol physical_ticket.ticket_purchase.amount_paid
+  %td
+    .btn-group
+      = link_to 'Show',
+      conference_physical_ticket_path(conference.short_title,
+                                      physical_ticket.token),
+      class: 'btn btn-primary'
+      = link_to 'Generate PDF',
+      conference_physical_ticket_path(conference.short_title,
+                                      physical_ticket.token,
+                                      format: :pdf),
+      class: 'button btn btn-default btn-info'

app/views/admin/physical_tickets/index.html.haml

@@ -21,23 +21,11 @@
             %th ID
             %th Type
             %th User
+            %th Paid
             %th Actions
           %tbody
             - @physical_tickets.each do |physical_ticket|
-              %tr
-                %td= physical_ticket.id
-                %td= physical_ticket.ticket.title
-                %td= physical_ticket.user.email
-                %td
-                  .btn-group
-                    = link_to 'Show',
-                    conference_physical_ticket_path(@conference.short_title,
-                                                    physical_ticket.token),
-                    class: 'btn btn-primary'
-                    = link_to 'Generate PDF',
-                    conference_physical_ticket_path(@conference.short_title,
-                                                    physical_ticket.token,
-                                                    format: :pdf),
-                    class: 'button btn btn-default btn-info'
+              = render "physical_ticket", physical_ticket: physical_ticket,
+                conference: @conference
   - else
     %h5 No Tickets sold!

app/views/admin/tickets/index.html.haml

@@ -27,7 +27,7 @@
               %td
                 = ticket.tickets_sold
               %td
-                = humanized_money_with_symbol ticket.tickets_turnover
+                = humanized_money_with_symbol ticket.tickets_turnover_total(ticket.id)
               %td
                 = ticket.registration_ticket? ? 'Yes' : 'No'
               %td

app/views/admin/versions/_object_desc_and_link.html.haml

@@ -12,10 +12,13 @@
   - role = Role.find_by(id: users_role.role_id) if users_role
   role
   - if role.name == 'organization_admin'
-    -# organization_admin belongs to organization and not conferences
-    - organization = Organization.find(version.conference_id)
-    = link_if_alive version, role.name,
+    - if Organization.find_by(id: version.conference_id)
+      -# organization_admin belongs to organization and not conferences
+      - organization = Organization.find_by(id: version.conference_id)
+      = link_if_alive version, role.name,
             admins_admin_organization_path(organization), organization
+    - else
+      (Deleted Organization)
   - else
     - conference = Conference.find_by(id: version.conference_id)
     - conference_short_title = conference.try(:short_title) || current_or_last_object_state('Conference', version.conference_id).try(:short_title) || ' '
@@ -140,10 +143,13 @@
   - role = current_or_last_object_state(version.item_type, version.item_id)
   - role_name = role.try(:name) || PaperTrail::Version.where(item_type: 'Role', item_id: version.item_id).last.changeset[:name].second
   - if role_name == 'organization_admin'
-    -# organization_admin belongs to organization and not conferences
-    - organization = Organization.find(version.conference_id)
-    = link_if_alive version, role_name,
+    - if Organization.find_by(id: version.conference_id)
+      -# organization_admin belongs to organization and not conferences
+      - organization = Organization.find_by(id: version.conference_id)
+      = link_if_alive version, role.name,
             admins_admin_organization_path(organization), organization
+    - else
+      (Role Deleted)
   - else
     - conference = Conference.find_by(id: version.conference_id)
     - conference_short_title = conference.try(:short_title) || current_or_last_object_state('Conference', version.conference_id).try(:short_title) || ' '
@@ -224,7 +230,12 @@
 - unless %w(Conference Subscription Registration User Organization).include?(version.item_type)
   - if (version.item_type == 'Role' && role_name == 'organization_admin') || (version.item_type == 'UsersRole' && role.name == 'organization_admin')
     in organization
-    = link_to_organization(version.conference_id)
+    - if Organization.find_by(id: version.conference_id)
+      -# organization_admin belongs to organization and not conferences
+      - organization = Organization.find_by(id: version.conference_id)
+      = link_to_organization(version.conference_id)
+    - else
+      (Organization Deleted)
   - else
     in conference
     = link_to_conference(version.conference_id)

app/views/conference_registrations/show.html.haml

@@ -101,7 +101,7 @@
                 = word_pluralize(@total_quantity[ticket_id], 'Ticket')
                 for
                 = tickets.first.price.symbol
-                = humanized_money tickets.first.price
+                = humanized_money @total_price_per_ticket[ticket_id]
             %br
         - if @tickets.any?
           = link_to 'Get more tickets', conference_tickets_path(@conference.short_title), class: "btn btn-default"

config/deploy.rb

@@ -3,7 +3,7 @@ require 'mina/rails'
 require 'mina/git'
 
 set :domain, 'proxy-opensuse.suse.de'
-set :port, 2214
+set :port, 2252
 set :user, 'osem'
 set :deploy_to, '/srv/www/vhosts/opensuse.org/events'
 set :repository, 'https://github.com/openSUSE/osem.git'
@@ -42,7 +42,7 @@ task deploy: :environment do
     #invoke :notify_errbit
 
     to :launch do
-      queue "sudo /etc/init.d/apache2 restart"
+      queue "sudo /usr/bin/systemctl restart apache2"
       queue "cd #{deploy_to}/current && RAILS_ENV=production bin/delayed_job start"
     end
 

db/migrate/20170924190528_add_amount_paid_to_ticket_purchases.rb

@@ -0,0 +1,5 @@
+class AddAmountPaidToTicketPurchases < ActiveRecord::Migration
+  def change
+    add_column :ticket_purchases, :amount_paid, :float, default: 0
+  end
+end

db/schema.rb

@@ -11,7 +11,7 @@
 #
 # It's strongly recommended that you check this file into your version control system.
 
-ActiveRecord::Schema.define(version: 20170816203325) do
+ActiveRecord::Schema.define(version: 20170924190528) do
 
   create_table "ahoy_events", force: :cascade do |t|
     t.uuid     "visit_id",   limit: 16
@@ -504,6 +504,7 @@ ActiveRecord::Schema.define(version: 20170816203325) do
     t.integer  "user_id"
     t.integer  "payment_id"
     t.integer  "week"
+    t.float    "amount_paid"
   end
 
   create_table "ticket_scannings", force: :cascade do |t|

spec/controllers/conference_registration_controller_spec.rb

@@ -252,7 +252,7 @@ describe ConferenceRegistrationsController, type: :controller do
         end
 
         it 'does not assign price of purchased tickets to total_price and purchased tickets to tickets without payment' do
-          expect(assigns(:total_price)).to eq Money.new(0, 'USD')
+          expect(assigns(:total_price)).to eq 0
         end
       end
 
@@ -262,7 +262,7 @@ describe ConferenceRegistrationsController, type: :controller do
         end
 
         it 'assigns 0 dollars to total_price and empty array to tickets variables' do
-          expect(assigns(:total_price)).to eq Money.new(0, 'USD')
+          expect(assigns(:total_price)).to eq 0
           expect(assigns(:tickets)).to match_array []
         end
       end