Merge branch 'main' of github.com:cs169/snapcon

Author: warrenlet

app/assets/javascripts/osem-tickets.js

@@ -1,69 +1,34 @@
-
-function update_currency_rates(data) {
-    data.forEach(function(conversion) {
-        var key = conversion.from_currency + "_to_" + conversion.to_currency;
-        window.currencyRates[key] = { rate: conversion.rate, symbol: conversion.symbol };
-    });
-    $('.quantity').each(function() {
-        update_price($(this));
-    });
-}
-
-function fetch_currency_rates(){
-    //todo get conference dynamically
-    var conferenceIdentifier = $('meta[name="conference-short-title"]').data('short-title');
-    var requestUrl = "/admin/conferences/" + conferenceIdentifier + "/currency_conversions";
-    $.ajax({
-        url: requestUrl, 
-        type: "GET",
-        dataType: "json",
-        success: function(data) {
-            update_currency_rates(data);
-        },
-        error: function(xhr, status, error) {
-          console.error("Failed to fetch currency rates: " + error);
-        }
-    });
-    
-}
-
 function update_price($this){
-
     var id = $this.data('id');
-
     var selectedCurrency = $('#currency_selector').val();
-    var baseCurrency = "USD"; // todo fetch from controller
-    var conversionKey = baseCurrency + "_to_" + selectedCurrency;
-    var conversionData = window.currencyRates[conversionKey] || { rate: 1, symbol: '$' };
+    var conversionData = window.currencyRates[selectedCurrency] || { rate: 1, symbol: '$' };
     var conversionRate = conversionData.rate;
 
     var originalPrice = parseFloat($('#price_'+id).data('original-price'));
     var convertedPrice = originalPrice*conversionRate;
 
-
     // Calculate price for row
-    var value = $this.val();
-    $('#price_' + id).text(conversionData.symbol + " " + convertedPrice.toFixed(2));
-
-
-    $('#total_row_' + id).text(conversionData.symbol + " " + (value * convertedPrice).toFixed(2));
+    $('#currency_symbol_' + id).text(conversionData.symbol);
+    $('#total_currency_symbol_' + id).text(conversionData.symbol);
+    $('#price_' + id).text(convertedPrice.toFixed(2));
+    $('#total_row_' + id).text((convertedPrice * $this.val()).toFixed(2));
 
     // Calculate total price
     var total = 0;
-    $('.total_row').each(function( index ) {
-        //a bit hacky, look into setting symbol as an attribute by itself instead of concatenating
-        total += parseFloat($(this).text().replace(conversionData.symbol, '').trim());
+    $('span[id^="total_row_"]').each(function() {
+        total += parseFloat($(this).text());
     });
-    $('#total_price').text(conversionData.symbol + total.toFixed(2));
+    $('#total-currency-symbol').text(conversionData.symbol);
+    $('#total-price').text(total.toFixed(2));
 }
 
 $( document ).ready(function() {
 
-    // Initialize currency conversion rates
     window.currencyRates = {};
-
-    if($('#currency_selector').length > 0) {
-        fetch_currency_rates();
+    if (window.currencyMeta) {
+        window.currencyMeta.forEach(function(currencyInfo) {
+            window.currencyRates[currencyInfo.currency] = { rate: currencyInfo.rate, symbol: currencyInfo.symbol };
+        });
     }
 
     $('.quantity').each(function() {
@@ -77,8 +42,6 @@ $( document ).ready(function() {
       $('[data-toggle="tooltip"]').tooltip()
     });
 
-
-    // Add change event listener to currency selector
     $('#currency_selector').change(function() {
         $('.quantity').each(function() {
             update_price($(this));

app/controllers/admin/currency_conversions_controller.rb

@@ -6,22 +6,7 @@ class CurrencyConversionsController < Admin::BaseController
     before_action :set_currency_options, only: [:new, :create, :edit]
 
     # GET /currency_conversions
-    def index
-      #todo: rescue currency that doesnt exist
-      currency_conversions_with_symbols = @conference.currency_conversions.map do |conversion|
-        {
-          from_currency: conversion.from_currency,
-          to_currency: conversion.to_currency,
-          rate: conversion.rate,
-          symbol: Money::Currency.new(conversion.to_currency).symbol
-        }
-      end
-
-      respond_to do |format|
-        format.html
-        format.json { render json: currency_conversions_with_symbols }
-      end
-    end
+    def index; end
 
     # GET /currency_conversions/1
     def show; end

app/controllers/admin/tickets_controller.rb

@@ -97,7 +97,7 @@ def ticket_params
 
     def gift_ticket_params
       response = params.require(:ticket_purchase).permit(:user_id)
-      response.merge(paid: true, amount_paid: 0, conference: @conference)
+      response.merge(paid: true, amount_paid: 0, conference: @conference, currency: @conference.tickets.first.price_currency)
     end
   end
 end

app/controllers/payments_controller.rb

@@ -5,34 +5,33 @@ class PaymentsController < ApplicationController
   load_and_authorize_resource
   load_resource :conference, find_by: :short_title
   authorize_resource :conference_registrations, class: Registration
-  before_action :load_currency_conversions, only: [:new, :create]
 
   def index
     @payments = current_user.payments
   end
 
   def new
-    # todo: use "base currency"
+    # TODO: use "base currency"
     session[:selected_currency] = params[:currency] if params[:currency].present?
-    selected_currency = session[:selected_currency] || 'USD'
-    from_currency = "USD"
+    selected_currency = session[:selected_currency] || @conference.tickets.first.price_currency
+    from_currency = @conference.tickets.first.price_currency
 
-    @total_amount_to_pay = convert_currency(Ticket.total_price(@conference, current_user, paid: false).amount, from_currency, selected_currency)
+    @total_amount_to_pay = CurrencyConversion.convert_currency(@conference, Ticket.total_price(@conference, current_user, paid: false), from_currency, selected_currency)
     raise CanCan::AccessDenied.new('Nothing to pay for!', :new, Payment) if @total_amount_to_pay.zero?
+    raise CanCan::AccessDenied.new('Selected currency is invalid!', :new, Payment) if @total_amount_to_pay.negative?
 
     @has_registration_ticket = params[:has_registration_ticket]
     @unpaid_ticket_purchases = current_user.ticket_purchases.unpaid.by_conference(@conference)
-    #a way to display the currency values in the view, but there might be a better way to do this.
+
     @converted_prices = {}
     @unpaid_ticket_purchases.each do |ticket_purchase|
-      #hardcoded
-      @converted_prices[ticket_purchase.id] = convert_currency(ticket_purchase.price.amount, 'USD', selected_currency)
+      @converted_prices[ticket_purchase.id] = ticket_purchase.amount_paid
     end
     @currency = selected_currency
   end
 
   def create
-    @payment = Payment.new (payment_params)
+    @payment = Payment.new payment_params
 
     if @payment.purchase && @payment.save
       update_purchased_ticket_purchases
@@ -52,7 +51,7 @@ def create
                     notice: 'Thanks! Your ticket is booked successfully.'
       end
     else
-      @total_amount_to_pay = convert_currency(Ticket.total_price(@conference, current_user, paid: false).amount, from_currency, selected_currency)
+      @total_amount_to_pay = convert_currency(@conference, Ticket.total_price(@conference, current_user, paid: false), from_currency, selected_currency)
       @unpaid_ticket_purchases = current_user.ticket_purchases.unpaid.by_conference(@conference)
       flash.now[:error] = @payment.errors.full_messages.to_sentence + ' Please try again with correct credentials.'
       render :new
@@ -73,27 +72,4 @@ def update_purchased_ticket_purchases
       ticket_purchase.pay(@payment)
     end
   end
-
-  def load_currency_conversions
-    @currency_conversions = @conference.currency_conversions
-  end
-
-  def convert_currency(amount, from_currency, to_currency)
-    update_rate(from_currency, to_currency)
-  
-    money_amount = Money.from_amount(amount, from_currency)
-    converted_amount = money_amount.exchange_to(to_currency)
-    converted_amount
-  end
-  
-  def update_rate(from_currency, to_currency)
-    conversion = @currency_conversions.find_by(from_currency: from_currency, to_currency: to_currency)
-    if conversion
-      Money.add_rate(from_currency, to_currency, conversion.rate)
-    else
-      #If no conversion is found. Typically only possible if base to base. Maybe make this error out.
-      Money.add_rate(from_currency, to_currency, 1) unless from_currency == to_currency
-    end
-  end
-
 end

app/controllers/ticket_purchases_controller.rb

@@ -4,6 +4,7 @@ class TicketPurchasesController < ApplicationController
   before_action :authenticate_user!
   load_resource :conference, find_by: :short_title
   authorize_resource :conference_registrations, class: Registration
+  authorize_resource
 
   def create
     current_user.ticket_purchases.by_conference(@conference).unpaid.destroy_all

app/controllers/tickets_controller.rb

@@ -4,9 +4,7 @@ class TicketsController < ApplicationController
   before_action :authenticate_user!
   load_resource :conference, find_by: :short_title
   before_action :load_tickets
-
   before_action :load_currency_conversions, only: :index
-
   authorize_resource :ticket, through: :conference
   authorize_resource :conference_registrations, class: Registration
   before_action :check_load_resource, only: :index
@@ -26,6 +24,12 @@ def load_tickets
 
   def load_currency_conversions
     @currency_conversions = @conference.currency_conversions
-    @currencies = @currency_conversions.map(&:to_currency).uniq
+    @currencies = [@conference.tickets.first.price_currency] | @currency_conversions.map(&:to_currency).uniq
+    @currency_meta = @currencies.map do |currency|
+      currency_conversion = @currency_conversions.find { |c| c.to_currency == currency }
+      rate = currency_conversion ? currency_conversion.rate : 1
+      symbol = Money::Currency.new(currency).symbol
+      { currency: currency, rate: rate, symbol: symbol }
+    end
   end
 end

app/models/currency_conversion.rb

@@ -25,4 +25,16 @@ class CurrencyConversion < ApplicationRecord
   belongs_to :conference
   validates :rate, numericality: { greater_than: 0 }
   validates :from_currency, uniqueness: { scope: :to_currency }, on: :create
+
+  def self.convert_currency(conference, amount, from_currency, to_currency)
+    conversion = conference.currency_conversions.find_by(from_currency: from_currency, to_currency: to_currency)
+    if conversion
+      Money.add_rate(from_currency, to_currency, conversion.rate)
+      amount.exchange_to(to_currency)
+    elsif from_currency == to_currency
+      amount
+    else
+      Money.from_amount(-1, 'USD')
+    end
+  end
 end

app/models/payment.rb

@@ -34,7 +34,7 @@ class Payment < ApplicationRecord
   }
 
   def amount_to_pay
-    Ticket.total_price(conference, user, paid: false).cents
+    CurrencyConversion.convert_currency(conference, Ticket.total_price(conference, user, paid: false), conference.tickets.first.price_currency, currency).cents
   end
 
   def stripe_description

app/models/ticket_purchase.rb

@@ -23,7 +23,7 @@ class TicketPurchase < ApplicationRecord
   belongs_to :conference
   belongs_to :payment
 
-  validates :ticket_id, :user_id, :conference_id, :quantity, presence: true
+  validates :ticket_id, :user_id, :conference_id, :quantity, :currency, presence: true
   validate :one_registration_ticket_per_user
   validate :registration_ticket_already_purchased, on: :create
   validates :quantity, numericality: { greater_than: 0 }
@@ -65,14 +65,19 @@ def self.purchase(conference, user, purchases, currency)
   end
 
   def self.purchase_ticket(conference, quantity, ticket, user, currency)
+    converted_amount = CurrencyConversion.convert_currency(conference, ticket.price, ticket.price_currency, currency)
+    if converted_amount < 0
+      errors.push('Currency is invalid')
+      purchase.pay(nil)
+    end
     if quantity > 0
       purchase = new(ticket_id:     ticket.id,
                      conference_id: conference.id,
                      user_id:       user.id,
                      quantity:      quantity,
-                     amount_paid:   ticket.price,
-                     currency: currency)
-      purchase.pay(nil) if ticket.price_cents.zero?
+                     amount_paid:   converted_amount,
+                     currency:      currency)
+      purchase.pay(nil) if converted_amount.zero?
     end
     purchase
   end

app/views/payments/_payment.html.haml

@@ -18,7 +18,6 @@
             = humanized_money_with_symbol @converted_prices[ticket.id]
           %td
             = humanized_money_with_symbol (@converted_prices[ticket.id] * ticket.quantity)
-            
 = form_tag conference_payments_path(@conference.short_title, :has_registration_ticket => @has_registration_ticket) do
   %script.stripe-button{ src: "https://checkout.stripe.com/checkout.js",
         data: { amount: @total_amount_to_pay.cents,

app/views/tickets/_ticket.html.haml

@@ -23,9 +23,13 @@
         You currently have a registraction ticket.
 
   %td.col-sm-1.col-md-1.text-center
+    %span.currency-symbol{id: "currency_symbol_#{ticket.id}"}
+      = ticket.price.currency.symbol
     %span{id: "price_#{ticket.id}", 'data-original-price': humanized_money(ticket.price).to_s}
       = humanized_money ticket.price
   %td.col-sm-1.col-md-1.text-center
     %strong
-      %span.total_row{id: "total_row_#{ticket.id}"}
+      %span.total-currency-symbol{id: "total_currency_symbol_#{ticket.id}"}
+        = ticket.price.currency.symbol
+      %span.total-row{id: "total_row_#{ticket.id}"}
         0

app/views/tickets/index.html.haml

@@ -1,4 +1,6 @@
 %meta{name: 'conference-short-title', data: { short_title: @conference.short_title }}
+:javascript
+  window.currencyMeta = #{@currency_meta.to_json.html_safe};
 .container
   .row
     .col-md-8
@@ -38,8 +40,8 @@
         %td.col-sm-1.col-md-1.text-center
           %h4
             %strong
-              %span{ id: 'total_price' }
-                0
+              %span#total-currency-symbol $
+              %span#total-price 0
     .pull-right
       .btn-group-vertical
         = button_tag(type: 'submit', class: 'btn btn-success btn-lg') do

spec/factories/payments.rb

@@ -20,5 +20,6 @@
     user
     conference
     status { 'unpaid' }
+    currency { 'USD' }
   end
 end

spec/factories/ticket_purchases.rb

@@ -22,6 +22,7 @@
     conference
     ticket
     quantity { 10 }
+    currency { 'USD' }
     factory :paid_ticket_purchase do
       after(:build) do |ticket_purchase|
         payment = create(:payment)

spec/features/currency_conversions_spec.rb

@@ -106,26 +106,5 @@
         end
       end
     end
-
-    it 'buys a ticket in EUR', feature: true, js: true do
-      create(:ticket, conference: conference, price_cents: 10_000)
-      conference.currency_conversions << create(:currency_conversion)
-      visit conference_tickets_path(conference.short_title)
-      select 'EUR', from: 'currency_selector'
-      find('.quantity', match: :first).set(1)
-      expect(page).to have_content('89.00') # 100 USD to EUR at a rate of 0.89
-    end
-
-    it 'switches between EUR and GBP', feature: true, js: true do
-      create(:ticket, conference: conference, price_cents: 10_000)
-      conference.currency_conversions << create(:currency_conversion)
-      create(:currency_conversion, from_currency: 'USD', to_currency: 'GBP', rate: 0.75, conference: conference)
-      visit conference_tickets_path(conference.short_title)
-      select 'EUR', from: 'currency_selector'
-      find('.quantity', match: :first).set(1)
-      expect(page).to have_content('89.00')
-      select 'GBP', from: 'currency_selector'
-      expect(page).to have_content('75.00')
-    end
   end
 end