Condense things a bit, fix logic with with tallying

cs169 · Apr 5, 2024 · b44006e · b44006e
1 parent 2968d9f
commit b44006e
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 9 deletions.
diff --git a/app/assets/javascripts/osem-tickets.js b/app/assets/javascripts/osem-tickets.js
@@ -15,8 +15,8 @@ function update_price($this){
 
     // Calculate total price
     var total = 0;
-    $('.total_row').each(function() {
-        total += parseFloat($(this).text().trim());
+    $('span[id^="total_row_"]').each(function() {
+        total += parseFloat($(this).text());
     });
     $('#total-currency-symbol').text(conversionData.symbol);
     $('#total-price').text(total.toFixed(2));

diff --git a/app/controllers/tickets_controller.rb b/app/controllers/tickets_controller.rb
@@ -24,15 +24,10 @@ def load_tickets
 
   def load_currency_conversions
     @currency_conversions = @conference.currency_conversions
-    @currencies = [@conference.tickets.first.price_currency]
-    @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 = if currency_conversion
-               currency_conversion.rate
-             else
-               1
-             end
+      rate = currency_conversion ? currency_conversion.rate : 1
       symbol = Money::Currency.new(currency).symbol
       { currency: currency, rate: rate, symbol: symbol }
     end