Merge branch 'main' into 187121499_Enable_Default_Currency

Author: owennny

Gemfile.lock

@@ -404,6 +404,8 @@ GEM
     nio4r (2.7.0)
     nokogiri (1.16.2-arm64-darwin)
       racc (~> 1.4)
+    nokogiri (1.16.2-x86_64-darwin)
+      racc (~> 1.4)
     nokogiri (1.16.2-x86_64-linux)
       racc (~> 1.4)
     oauth2 (2.0.9)
@@ -657,6 +659,7 @@ GEM
       activesupport (>= 5.2)
       sprockets (>= 3.0.0)
     sqlite3 (1.6.3-arm64-darwin)
+    sqlite3 (1.6.3-x86_64-darwin)
     sqlite3 (1.6.3-x86_64-linux)
     ssrf_filter (1.1.2)
     stripe (5.55.0)
@@ -719,6 +722,7 @@ GEM
 
 PLATFORMS
   arm64-darwin-23
+  x86_64-darwin-21
   x86_64-linux
 
 DEPENDENCIES

app/controllers/admin/currency_conversions_controller.rb

@@ -2,6 +2,8 @@ module Admin
   class CurrencyConversionsController < Admin::BaseController
     load_and_authorize_resource :conference, find_by: :short_title
     load_and_authorize_resource :currency_conversion, through: :conference
+    before_action :check_for_tickets, only: [:new, :create, :edit]
+    before_action :set_currency_options, only: [:new, :create, :edit]
 
     # GET /currency_conversions
     def index; end
@@ -12,6 +14,7 @@ def show; end
     # GET /currency_conversions/new
     def new
       @currency_conversion = @conference.currency_conversions.new(conference_id: @conference.short_title)
+      @currency_conversion.from_currency = @conference.tickets.first.price_currency
     end
 
     # GET /currency_conversions/1/edit
@@ -20,7 +23,7 @@ def edit; end
     # POST /currency_conversions
     def create
       @currency_conversion = @conference.currency_conversions.new(currency_conversion_params)
-
+      @currency_conversion.from_currency = @conference.tickets.first.price_currency
       if @currency_conversion.save
         redirect_to admin_conference_currency_conversions_path(@conference.short_title), notice: 'Currency conversion was successfully created.'
       else
@@ -52,7 +55,18 @@ def destroy
 
     # Only allow a list of trusted parameters through.
     def currency_conversion_params
-      params.require(:currency_conversion).permit(:from_currency, :to_currency, :rate)
+      params.require(:currency_conversion).permit(:to_currency, :rate)
+    end
+
+    def set_currency_options
+      @currency_conversion.from_currency = @conference.tickets.first.price_currency
+      @to_currency_options = CurrencyConversion::VALID_CURRENCIES.reject { |i| i == @currency_conversion.from_currency }
+    end
+
+    def check_for_tickets
+      if @conference.tickets.empty?
+        redirect_to admin_conference_currency_conversions_path, alert: 'No tickets available for this conference. Cannot create or edit currency conversions.'
+      end
     end
   end
 end

app/views/admin/currency_conversions/_form.html.haml

@@ -1,10 +1,10 @@
 = form_for(@currency_conversion, url: (@currency_conversion.new_record? ? admin_conference_currency_conversions_path : admin_conference_currency_conversion_path(@conference.short_title, @currency_conversion))) do |f|
   .form-group
-    = f.label :from_currency
-    = f.text_field :from_currency, autofocus: true , required: true, class: 'form-control'
+    %label From currency
+    = text_field_tag :from_currency, @currency_conversion.from_currency, disabled: true, class: 'form-control'
   .form-group
     = f.label :to_currency
-    = f.text_field :to_currency, autofocus: true , required: true, class: 'form-control'
+    = f.select :to_currency, @to_currency_options, {include_blank: 'Select Currency'}, autofocus: true, required: true, class: 'form-control'
   .form-group
     = f.label :rate
     = f.text_field :rate, autofocus: true, required: true, class: 'form-control', type: 'number', step: '0.01'

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

@@ -12,8 +12,8 @@
     %table.table.table-hover#currency-conversions
       %thead
         %tr
-          %th From Curr
-          %th To Curr
+          %th From Currency
+          %th To Currency
           %th Rate
           %th Actions
       %tbody

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

@@ -26,7 +26,7 @@
   - if Ticket.where(conference: @conference).empty?
     .form-group
       = f.label :price_currency, 'Currency'
-      = f.select :price_currency, ['USD', 'EUR', 'GBP', 'INR', 'CNY', 'CHF'], { include_blank: false }, { class: 'form-control' }
+      = f.select :price_currency, CurrencyConversion::VALID_CURRENCIES, { include_blank: false }, { class: 'form-control' }
   - else
     = hidden_field_tag "ticket[price_currency]", f.object.conference.tickets.first.price_currency
     %span.help-block

db/schema.rb

@@ -10,7 +10,9 @@
 #
 # It's strongly recommended that you check this file into your version control system.
 
+
 ActiveRecord::Schema[7.0].define(version: 2024_03_06_000725) do
+
   # These are extensions that must be enabled in order to support this database
   enable_extension "pg_stat_statements"
   enable_extension "plpgsql"

spec/factories/event_types.rb

@@ -24,7 +24,7 @@
     description { 'Example Event Description\nThis event type is an example.' }
     minimum_abstract_length { 0 }
     maximum_abstract_length { 500 }
-    submission_template { 'Example Event Instructions _with_ **markdown**' }
+    submission_template { 'Example Event Template _with_ **markdown**' }
     color { '#ffffff' }
     program
   end

spec/features/currency_conversions_spec.rb

@@ -15,60 +15,95 @@
       sign_out
     end
 
-    it 'add a currency conversion', feature: true do
-      visit admin_conference_currency_conversions_path(conference.short_title)
-      click_link 'Add Currency Conversion'
-
-      fill_in 'currency_conversion_from_currency', with: 'USD'
-      fill_in 'currency_conversion_to_currency', with: 'EUR'
-      fill_in 'currency_conversion_rate', with: '0.89'
+    context 'for a conference with no tickets' do
+      before do
+        conference.currency_conversions << create(:currency_conversion)
+        conference.tickets.destroy_all
+      end
 
-      click_button 'Create Currency conversion'
-      page.find('#flash')
-      expect(flash).to eq('Currency conversion was successfully created.')
-      within('table#currency-conversions') do
-        expect(page.has_content?('USD')).to be true
-        expect(page.has_content?('EUR')).to be true
-        expect(page.has_content?('0.89')).to be true
-        expect(page.assert_selector('tbody tr', count: 1)).to be true
+      it 'show error message when adding new currency conversion', feature: true, js: true do
+        visit admin_conference_currency_conversions_path(conference.short_title)
+        click_link 'Add Currency Conversion'
+        page.find('#flash')
+        expect(flash).to eq('No tickets available for this conference. Cannot create or edit currency conversions.')
       end
-    end
 
-    it 'edit a currency conversion', feature: true do
-      conference.currency_conversions << create(:currency_conversion)
-      visit admin_conference_currency_conversions_path(conference.short_title)
-      within('table tbody tr:nth-of-type(1) td:nth-of-type(4)') do
-        click_link 'Edit'
+      it 'show error message when editing a currency conversion', feature: true, js: true do
+        visit admin_conference_currency_conversions_path(conference.short_title)
+        within('table tbody tr:nth-of-type(1) td:nth-of-type(4)') do
+          click_link 'Edit'
+        end
+        page.find('#flash')
+        expect(flash).to eq('No tickets available for this conference. Cannot create or edit currency conversions.')
       end
-      fill_in 'currency_conversion_from_currency', with: 'USD'
-      fill_in 'currency_conversion_to_currency', with: 'RMB'
-      fill_in 'currency_conversion_rate', with: '6.9'
-      click_button 'Update Currency conversion'
-      page.find('#flash')
-      expect(flash).to eq('Currency conversion was successfully updated.')
-      within('table#currency-conversions') do
-        expect(page.has_content?('USD')).to be true
-        expect(page.has_content?('RMB')).to be true
-        expect(page.has_content?('6.9')).to be true
-        expect(page.assert_selector('tbody tr', count: 1)).to be true
+
+      it 'does not show error message when deleting a currency conversion', feature: true, js: true do
+        visit admin_conference_currency_conversions_path(conference.short_title)
+        page.accept_alert do
+          within('table tbody tr:nth-of-type(1) td:nth-of-type(4)') do
+            click_link 'Delete'
+          end
+        end
+        page.find('#flash')
+        expect(flash).to eq('Currency conversion was successfully deleted.')
+        within('table#currency-conversions') do
+          expect(page.assert_selector('tbody tr', count: 0)).to be true
+        end
       end
     end
 
-    it 'Deletes Currency Conversion', feature: true, js: true do
-      conference.currency_conversions << create(:currency_conversion)
-      visit admin_conference_currency_conversions_path(conference.short_title)
-      # Remove currency conversion
-      page.accept_alert do
+    context 'for a conference with tickets' do
+      it 'add a currency conversion', feature: true, js: true do
+        visit admin_conference_currency_conversions_path(conference.short_title)
+        click_link 'Add Currency Conversion'
+        select 'EUR', from: 'currency_conversion_to_currency'
+        fill_in 'currency_conversion_rate', with: '0.89'
+        click_button 'Create Currency conversion'
+        page.find('#flash')
+        expect(flash).to eq('Currency conversion was successfully created.')
+        within('table#currency-conversions') do
+          expect(page.has_content?('USD')).to be true
+          expect(page.has_content?('EUR')).to be true
+          expect(page.has_content?('0.89')).to be true
+          expect(page.assert_selector('tbody tr', count: 1)).to be true
+        end
+      end
+
+      it 'edit a currency conversion', feature: true, js: true do
+        conference.currency_conversions << create(:currency_conversion)
+        visit admin_conference_currency_conversions_path(conference.short_title)
         within('table tbody tr:nth-of-type(1) td:nth-of-type(4)') do
-          click_link 'Delete'
+          click_link 'Edit'
+        end
+        select 'JPY', from: 'currency_conversion_to_currency'
+        fill_in 'currency_conversion_rate', with: '6.9'
+        click_button 'Update Currency conversion'
+        page.find('#flash')
+        expect(flash).to eq('Currency conversion was successfully updated.')
+        within('table#currency-conversions') do
+          expect(page.has_content?('USD')).to be true
+          expect(page.has_content?('JPY')).to be true
+          expect(page.has_content?('6.9')).to be true
+          expect(page.assert_selector('tbody tr', count: 1)).to be true
         end
       end
-      page.find('#flash')
 
-      # Validations
-      expect(flash).to eq('Currency conversion was successfully deleted.')
-      within('table#currency-conversions') do
-        expect(page.assert_selector('tbody tr', count: 0)).to be true
+      it 'Deletes Currency Conversion', feature: true, js: true do
+        conference.currency_conversions << create(:currency_conversion)
+        visit admin_conference_currency_conversions_path(conference.short_title)
+        # Remove currency conversion
+        page.accept_alert do
+          within('table tbody tr:nth-of-type(1) td:nth-of-type(4)') do
+            click_link 'Delete'
+          end
+        end
+        page.find('#flash')
+
+        # Validations
+        expect(flash).to eq('Currency conversion was successfully deleted.')
+        within('table#currency-conversions') do
+          expect(page.assert_selector('tbody tr', count: 0)).to be true
+        end
       end
     end
   end

spec/features/proposals_spec.rb

@@ -179,7 +179,7 @@
       fill_in 'event_submission_text', with: 'Lorem ipsum submission_text'
       expect(page).to have_text('Submission text')
       # Submission Instructions content
-      expect(page).to have_text('Example Event Instructions')
+      expect(page).to have_text('Example Event Template')
 
       # TODO-SNAPCON: (mb) this field is always shown.
       # click_link 'Do you require something special for your event?'

spec/models/currency_conversion_spec.rb

@@ -0,0 +1,37 @@
+# frozen_string_literal: true
+
+# == Schema Information
+#
+# Table name: currency_conversions
+#
+#  id            :bigint           not null, primary key
+#  from_currency :string
+#  rate          :decimal(, )
+#  to_currency   :string
+#  created_at    :datetime         not null
+#  updated_at    :datetime         not null
+#  conference_id :bigint           not null
+#
+# Indexes
+#
+#  index_currency_conversions_on_conference_id  (conference_id)
+#
+# Foreign Keys
+#
+#  fk_rails_...  (conference_id => conferences.id)
+#
+require 'spec_helper'
+
+describe CurrencyConversion do
+  let!(:conference) { create(:conference, title: 'ExampleCon') }
+
+  describe 'validations' do
+    before do
+      conference.currency_conversions << create(:currency_conversion)
+    end
+
+    it { is_expected.to validate_numericality_of(:rate).is_greater_than(0) }
+
+    it { is_expected.to validate_uniqueness_of(:from_currency).scoped_to(:to_currency).on(:create) }
+  end
+end