lint

Author: Edge7481

app/controllers/admin/currency_conversions_controller.rb

@@ -7,13 +7,13 @@ class CurrencyConversionsController < Admin::BaseController
 
     # GET /currency_conversions
     def index
-      #todo: rescue currency that doesnt exist
+      # 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
+          to_currency:   conversion.to_currency,
+          rate:          conversion.rate,
+          symbol:        Money::Currency.new(conversion.to_currency).symbol
         }
       end
 

app/controllers/payments_controller.rb

@@ -12,27 +12,27 @@ def index
   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"
+    from_currency = 'USD'
 
     @total_amount_to_pay = convert_currency(Ticket.total_price(@conference, current_user, paid: false).amount, from_currency, selected_currency)
     raise CanCan::AccessDenied.new('Nothing to pay for!', :new, Payment) if @total_amount_to_pay.zero?
 
     @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.
+    # 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
+      # hardcoded
       @converted_prices[ticket_purchase.id] = convert_currency(ticket_purchase.price.amount, 'USD', selected_currency)
     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
@@ -80,20 +80,18 @@ def load_currency_conversions
 
   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
+    money_amount.exchange_to(to_currency)
   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.
+      # 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/models/ticket_purchase.rb

@@ -71,7 +71,7 @@ def self.purchase_ticket(conference, quantity, ticket, user, currency)
                      user_id:       user.id,
                      quantity:      quantity,
                      amount_paid:   ticket.price,
-                     currency: currency)
+                     currency:      currency)
       purchase.pay(nil) if ticket.price_cents.zero?
     end
     purchase

app/views/payments/_payment.html.haml

@@ -17,8 +17,7 @@
           %td
             = humanized_money_with_symbol @converted_prices[ticket.id]
           %td
-            = humanized_money_with_symbol (@converted_prices[ticket.id] * ticket.quantity)
-            
+            = 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,