From 3ed98b0406d66d1ae4767e0b966aaf9d554562a7 Mon Sep 17 00:00:00 2001
From: btolarz <btolarz@gmail.com>
Date: Fri, 18 Oct 2019 15:12:45 +0200
Subject: [PATCH] Moved supported currencies from preferencies to store

---
 .../concerns/spree/api/v2/storefront/order_concern.rb  |  4 +---
 .../controllers/spree/api/v1/stores_controller_spec.rb |  3 ++-
 api/spec/requests/spree/api/v2/storefront/cart_spec.rb |  6 +-----
 .../spree/admin/general_settings_controller.rb         |  2 +-
 .../views/spree/admin/general_settings/_form.html.erb  |  6 ------
 backend/app/views/spree/admin/stores/_form.html.erb    |  5 +++++
 .../spec/features/admin/configuration/stores_spec.rb   |  6 +++++-
 .../general_settings/prices_settings_presence_spec.rb  |  1 -
 .../general_settings/prices_settings_updating_spec.rb  |  5 +----
 .../features/admin/products/variant_prices_spec.rb     |  3 +--
 core/app/models/spree/app_configuration.rb             |  1 -
 core/app/models/spree/store.rb                         | 10 ++++++++++
 ...20191017121054_add_supported_currencies_to_store.rb |  8 ++++++++
 .../spree/core/controller_helpers/currency_helpers.rb  |  2 +-
 core/lib/spree/core/controller_helpers/store.rb        |  4 +---
 core/lib/spree/permitted_attributes.rb                 |  5 +++--
 .../spree/testing_support/factories/store_factory.rb   |  9 +++++----
 .../lib/spree/core/controller_helpers/store_spec.rb    |  9 +++++++++
 core/spec/models/spree/store_spec.rb                   | 10 ++++++++++
 frontend/spec/features/order_prices_spec.rb            |  3 ++-
 frontend/spec/features/product_prices_spec.rb          |  4 +---
 frontend/spec/features/template_rendering_spec.rb      |  3 ++-
 22 files changed, 69 insertions(+), 40 deletions(-)
 create mode 100644 core/db/migrate/20191017121054_add_supported_currencies_to_store.rb

diff --git a/api/app/controllers/concerns/spree/api/v2/storefront/order_concern.rb b/api/app/controllers/concerns/spree/api/v2/storefront/order_concern.rb
index 520be6bb900..37f907a7155 100644
--- a/api/app/controllers/concerns/spree/api/v2/storefront/order_concern.rb
+++ b/api/app/controllers/concerns/spree/api/v2/storefront/order_concern.rb
@@ -35,9 +35,7 @@ def find_spree_current_order
           end
 
           def supported_currencies
-            Spree::Config[:supported_currencies].split(',').map do |code|
-              ::Money::Currency.find(code.strip)
-            end
+            spree_current_store.supported_currencies_list
           end
 
           def serialize_order(order)
diff --git a/api/spec/controllers/spree/api/v1/stores_controller_spec.rb b/api/spec/controllers/spree/api/v1/stores_controller_spec.rb
index 4b5ebeb253a..86c959b7a0e 100644
--- a/api/spec/controllers/spree/api/v1/stores_controller_spec.rb
+++ b/api/spec/controllers/spree/api/v1/stores_controller_spec.rb
@@ -76,7 +76,8 @@ module Spree
           name: 'Hack0rz',
           url: 'spree123.example.com',
           mail_from_address: 'me@example.com',
-          default_currency: 'USD'
+          default_currency: 'USD',
+          supported_currencies: 'USD'
         }
         api_post :create, store: store_hash
         expect(response.status).to eq(201)
diff --git a/api/spec/requests/spree/api/v2/storefront/cart_spec.rb b/api/spec/requests/spree/api/v2/storefront/cart_spec.rb
index d3f8f190dda..e94fc519493 100644
--- a/api/spec/requests/spree/api/v2/storefront/cart_spec.rb
+++ b/api/spec/requests/spree/api/v2/storefront/cart_spec.rb
@@ -2,7 +2,7 @@
 
 describe 'API V2 Storefront Cart Spec', type: :request do
   let(:default_currency) { 'USD' }
-  let(:store) { create(:store, default_currency: default_currency) }
+  let!(:store) { create(:store, default_currency: default_currency) }
   let(:currency) { store.default_currency }
   let(:user)  { create(:user) }
   let(:order) { create(:order, user: user, store: store, currency: currency) }
@@ -359,10 +359,6 @@
     end
 
     context 'for specified currency' do
-      before do
-        Spree::Config[:supported_currencies] = 'USD,EUR'
-      end
-
       context 'store default' do
         before do
           store.update!(default_currency: 'EUR')
diff --git a/backend/app/controllers/spree/admin/general_settings_controller.rb b/backend/app/controllers/spree/admin/general_settings_controller.rb
index adab53eecfe..f1b6cf2e809 100644
--- a/backend/app/controllers/spree/admin/general_settings_controller.rb
+++ b/backend/app/controllers/spree/admin/general_settings_controller.rb
@@ -27,7 +27,7 @@ def clear_cache
       end
 
       def render(*args)
-        @preferences_currency |= [:allow_currency_change, :show_currency_selector, :supported_currencies]
+        @preferences_currency |= [:allow_currency_change, :show_currency_selector]
         super
       end
 
diff --git a/backend/app/views/spree/admin/general_settings/_form.html.erb b/backend/app/views/spree/admin/general_settings/_form.html.erb
index d54defac59e..d2b4342706a 100644
--- a/backend/app/views/spree/admin/general_settings/_form.html.erb
+++ b/backend/app/views/spree/admin/general_settings/_form.html.erb
@@ -4,12 +4,6 @@
   </div>
 
   <div class="panel-body">
-    <div class="form-group">
-      <label><%= Spree.t('supported_currencies.short') %></label>
-      <input type="text" class="form-control" value="<%= Spree::Config.supported_currencies %>" name="supported_currencies"/>
-      <p class="help-block"><%= Spree.t('supported_currencies.long') %></p>
-    </div>
-
     <div class="form-group">
       <div class="checkbox">
         <label>
diff --git a/backend/app/views/spree/admin/stores/_form.html.erb b/backend/app/views/spree/admin/stores/_form.html.erb
index b2811b65bad..f6cdb4c5f4a 100644
--- a/backend/app/views/spree/admin/stores/_form.html.erb
+++ b/backend/app/views/spree/admin/stores/_form.html.erb
@@ -29,6 +29,11 @@
     <%= f.text_field :mail_from_address, class: 'form-control', required: true %>
     <%= f.error_message_on :mail_from_address %>
   <% end %>
+  <%= f.field_container :supported_currencies, class: ['form-group'] do %>
+    <%= f.label :supported_currencies, Spree.t(:supported_currencies) %>
+    <%= f.text_field :supported_currencies, class: 'form-control' %>
+    <%= f.error_message_on :supported_currencies %>
+  <% end %>
   <%= f.field_container :default_currency, class: ['form-group'] do %>
     <%= f.label :default_currency, Spree.t(:default_currency) %>
     <%= f.text_field :default_currency, class: 'form-control' %>
diff --git a/backend/spec/features/admin/configuration/stores_spec.rb b/backend/spec/features/admin/configuration/stores_spec.rb
index 1939a8b9eb2..7fa47a5dfa3 100644
--- a/backend/spec/features/admin/configuration/stores_spec.rb
+++ b/backend/spec/features/admin/configuration/stores_spec.rb
@@ -34,6 +34,7 @@
       page.fill_in 'store_mail_from_address', with: 'spree@example.com'
       page.fill_in 'store_code', with: 'SPR'
       page.fill_in 'store_default_currency', with: 'EUR'
+      page.fill_in 'store_supported_currencies', with: 'EUR'
       click_button 'Create'
 
       expect(page).to have_current_path spree.admin_stores_path
@@ -53,13 +54,16 @@
       click_link 'Edit'
       page.fill_in 'store_name', with: updated_name
       page.fill_in 'store_default_currency', with: new_currency
+      page.fill_in 'store_supported_currencies', with: new_currency
       click_button 'Update'
 
       expect(page).to have_current_path spree.admin_stores_path
       store_table = page.find('table')
       expect(store_table).to have_content(updated_name)
       expect(store_table).to have_content(new_currency)
-      expect(store.reload.name).to eq updated_name
+      store.reload
+      expect(store.name).to eq updated_name
+      expect(store.supported_currencies).to eq new_currency
     end
   end
 
diff --git a/backend/spec/features/admin/general_settings/prices_settings_presence_spec.rb b/backend/spec/features/admin/general_settings/prices_settings_presence_spec.rb
index 6f99a373b68..24b0580b8ff 100644
--- a/backend/spec/features/admin/general_settings/prices_settings_presence_spec.rb
+++ b/backend/spec/features/admin/general_settings/prices_settings_presence_spec.rb
@@ -7,7 +7,6 @@
     it 'Multi Currency settings are present' do
       visit spree.edit_admin_general_settings_path
 
-      expect(page).to have_content 'Supported Currencies'
       expect(page).to have_content 'Allow Currency Change'
       expect(page).to have_content 'Show Currency Selector'
     end
diff --git a/backend/spec/features/admin/general_settings/prices_settings_updating_spec.rb b/backend/spec/features/admin/general_settings/prices_settings_updating_spec.rb
index 6122487cd1f..4ce756d3814 100644
--- a/backend/spec/features/admin/general_settings/prices_settings_updating_spec.rb
+++ b/backend/spec/features/admin/general_settings/prices_settings_updating_spec.rb
@@ -1,11 +1,11 @@
 require 'spec_helper'
 
 describe 'Updating currencies settings', type: :feature, js: true do
+  let!(:store) { create(:store, default: true) }
   stub_authorization!
 
   before do
     reset_spree_preferences do |config|
-      config.supported_currencies = 'USD'
       config.allow_currency_change = false
       config.show_currency_selector = false
     end
@@ -15,19 +15,16 @@
     visit spree.edit_admin_general_settings_path
 
     # Test initial state
-    expect(page).to have_field('supported_currencies', with: 'USD')
     expect(page).to have_unchecked_field('allow_currency_change')
     expect(page).to have_unchecked_field('show_currency_selector')
 
     # Interact with the form
-    fill_in 'supported_currencies', with: 'USD,PLN'
     check('allow_currency_change')
     check('show_currency_selector')
     click_button 'Update'
 
     # Test final state
     expect(page).to have_content 'General Settings has been successfully updated!'
-    expect(page).to have_field('supported_currencies', with: 'USD,PLN')
     expect(page).to have_checked_field('allow_currency_change')
     expect(page).to have_checked_field('show_currency_selector')
   end
diff --git a/backend/spec/features/admin/products/variant_prices_spec.rb b/backend/spec/features/admin/products/variant_prices_spec.rb
index ff242afb8d0..eded9d6c8ce 100644
--- a/backend/spec/features/admin/products/variant_prices_spec.rb
+++ b/backend/spec/features/admin/products/variant_prices_spec.rb
@@ -2,13 +2,12 @@
 
 describe 'Variant Prices', type: :feature, js: true do
   stub_authorization!
-
+  let!(:store) { create(:store, default: true) }
   let!(:product) { create(:product) }
 
   context 'with USD and EUR as currencies' do
     before do
       reset_spree_preferences do |config|
-        config.supported_currencies = 'USD,EUR'
         config.allow_currency_change = true
       end
     end
diff --git a/core/app/models/spree/app_configuration.rb b/core/app/models/spree/app_configuration.rb
index 77b16d33117..7eb39ed1e2c 100644
--- a/core/app/models/spree/app_configuration.rb
+++ b/core/app/models/spree/app_configuration.rb
@@ -69,7 +69,6 @@ class AppConfiguration < Preferences::Configuration
     # Multi currency configurations
     preference :allow_currency_change,  :boolean, default: false
     preference :show_currency_selector, :boolean, default: false
-    preference :supported_currencies,   :string,  default: 'USD'
 
     # searcher_class allows spree extension writers to provide their own Search class
     def searcher_class
diff --git a/core/app/models/spree/store.rb b/core/app/models/spree/store.rb
index eb2cea9f1c9..d4cd6ca2b2b 100644
--- a/core/app/models/spree/store.rb
+++ b/core/app/models/spree/store.rb
@@ -9,6 +9,10 @@ class Store < Spree::Base
       validates :default_currency
     end
 
+    if connection.column_exists?(:spree_stores, :supported_currencies)
+      validates :supported_currencies, presence: true
+    end
+
     before_save :ensure_default_exists_and_is_unique
     before_destroy :validate_not_default
 
@@ -27,6 +31,12 @@ def self.default
       end
     end
 
+    def supported_currencies_list
+      currencies = (read_attribute(:supported_currencies).to_s.split(',') << default_currency).map(&:to_s).map do |code|
+        ::Money::Currency.find(code.strip)
+      end.uniq.compact
+    end
+
     private
 
     def ensure_default_exists_and_is_unique
diff --git a/core/db/migrate/20191017121054_add_supported_currencies_to_store.rb b/core/db/migrate/20191017121054_add_supported_currencies_to_store.rb
new file mode 100644
index 00000000000..7b7d6d9e642
--- /dev/null
+++ b/core/db/migrate/20191017121054_add_supported_currencies_to_store.rb
@@ -0,0 +1,8 @@
+class AddSupportedCurrenciesToStore < ActiveRecord::Migration[6.0]
+  def change
+    add_column :spree_stores, :supported_currencies, :string
+    Spree::Store.all.each do |store|
+      store.update_attribute(:supported_currencies, store.default_currency)
+    end
+  end
+end
diff --git a/core/lib/spree/core/controller_helpers/currency_helpers.rb b/core/lib/spree/core/controller_helpers/currency_helpers.rb
index 265056f38a2..b95f8233333 100644
--- a/core/lib/spree/core/controller_helpers/currency_helpers.rb
+++ b/core/lib/spree/core/controller_helpers/currency_helpers.rb
@@ -7,7 +7,7 @@ def self.included(receiver)
         end
 
         def supported_currencies
-          Spree::Config[:supported_currencies].split(',').map { |code| ::Money::Currency.find(code.strip) }
+          current_store.supported_currencies_list
         end
       end
     end
diff --git a/core/lib/spree/core/controller_helpers/store.rb b/core/lib/spree/core/controller_helpers/store.rb
index 20dd9c7aa46..822ad31c552 100644
--- a/core/lib/spree/core/controller_helpers/store.rb
+++ b/core/lib/spree/core/controller_helpers/store.rb
@@ -20,9 +20,7 @@ def current_currency
         end
 
         def supported_currencies
-          Spree::Config[:supported_currencies].split(',').map do |code|
-            ::Money::Currency.find(code.strip)
-          end
+          current_store.supported_currencies_list
         end
 
         def current_store
diff --git a/core/lib/spree/permitted_attributes.rb b/core/lib/spree/permitted_attributes.rb
index 8aaf039f900..875e775bf02 100644
--- a/core/lib/spree/permitted_attributes.rb
+++ b/core/lib/spree/permitted_attributes.rb
@@ -39,7 +39,7 @@ module PermittedAttributes
     ]
 
     @@checkout_attributes = [
-      :coupon_code, :email, :shipping_method_id, :special_instructions, :use_billing, 
+      :coupon_code, :email, :shipping_method_id, :special_instructions, :use_billing,
       :user_id, :bill_address_id, :ship_address_id
     ]
 
@@ -97,7 +97,8 @@ module PermittedAttributes
     ]
 
     @@store_attributes = [:name, :url, :seo_title, :code, :meta_keywords,
-                          :meta_description, :default_currency, :mail_from_address]
+                          :meta_description, :default_currency, :supported_currencies,
+                          :mail_from_address]
 
     @@store_credit_attributes = %i[amount currency category_id memo]
 
diff --git a/core/lib/spree/testing_support/factories/store_factory.rb b/core/lib/spree/testing_support/factories/store_factory.rb
index 239b2b0610e..b94ebea5be9 100644
--- a/core/lib/spree/testing_support/factories/store_factory.rb
+++ b/core/lib/spree/testing_support/factories/store_factory.rb
@@ -1,9 +1,10 @@
 FactoryBot.define do
   factory :store, class: Spree::Store do
     sequence(:code)   { |i| "spree_#{i}" }
-    name              { 'Spree Test Store' }
-    url               { 'www.example.com' }
-    mail_from_address { 'spree@example.org' }
-    default_currency  { 'USD' }
+    name                  { 'Spree Test Store' }
+    url                   { 'www.example.com' }
+    mail_from_address     { 'spree@example.org' }
+    default_currency      { 'USD' }
+    supported_currencies  { 'USD,EUR,GBP' }
   end
 end
diff --git a/core/spec/lib/spree/core/controller_helpers/store_spec.rb b/core/spec/lib/spree/core/controller_helpers/store_spec.rb
index 41fee44a165..9734d3a5508 100644
--- a/core/spec/lib/spree/core/controller_helpers/store_spec.rb
+++ b/core/spec/lib/spree/core/controller_helpers/store_spec.rb
@@ -17,6 +17,15 @@ class FakesController < ApplicationController
     end
   end
 
+  describe '#supported_currencies' do
+    let(:currency) { 'EUR' }
+    let!(:store) { create :store, default: true, supported_currencies: currency }
+
+    it 'returns supported currencies' do
+      expect(controller.supported_currencies).to include(::Money::Currency.find(currency))
+    end
+  end
+
   describe '#current_price_options' do
     subject(:current_price_options) { controller.current_price_options }
 
diff --git a/core/spec/models/spree/store_spec.rb b/core/spec/models/spree/store_spec.rb
index bea8fad9d34..4de2217c789 100644
--- a/core/spec/models/spree/store_spec.rb
+++ b/core/spec/models/spree/store_spec.rb
@@ -72,5 +72,15 @@
         expect(Spree::Store.default.default).to be(true)
       end
     end
+
+    describe '.supported_currencies_list' do
+      let(:currencies) { 'USD, EUR, dummy' }
+      let!(:store) { create(:store, supported_currencies: currencies) }
+      it 'returns supported currencies list' do
+        expect(store.supported_currencies_list).to contain_exactly(
+          ::Money::Currency.find('USD'), ::Money::Currency.find('EUR')
+        )
+      end
+    end
   end
 end
diff --git a/frontend/spec/features/order_prices_spec.rb b/frontend/spec/features/order_prices_spec.rb
index 430c3ccb07e..56349b1bb57 100644
--- a/frontend/spec/features/order_prices_spec.rb
+++ b/frontend/spec/features/order_prices_spec.rb
@@ -1,14 +1,15 @@
 require 'spec_helper'
 
 describe 'Order', type: :feature, js: true do
+  let!(:store) { create(:store, default: true) }
   let!(:product) { create(:product) }
 
   before do
     reset_spree_preferences do |config|
-      config.supported_currencies   = 'USD,EUR,GBP'
       config.allow_currency_change  = true
       config.show_currency_selector = true
     end
+    
     create(:price, variant: product.master, currency: 'EUR', amount: 16.00)
     create(:price, variant: product.master, currency: 'GBP', amount: 23.00)
   end
diff --git a/frontend/spec/features/product_prices_spec.rb b/frontend/spec/features/product_prices_spec.rb
index e13045c2108..80106724e63 100644
--- a/frontend/spec/features/product_prices_spec.rb
+++ b/frontend/spec/features/product_prices_spec.rb
@@ -2,11 +2,11 @@
 
 describe 'Product with prices in multiple currencies', type: :feature, js: true do
   context 'with USD, EUR and GBP as currencies' do
+    let!(:store) { create(:store, default: true) }
     let!(:product) { create(:product) }
 
     before do
       reset_spree_preferences do |config|
-        config.supported_currencies   = 'USD,EUR,GBP'
         config.allow_currency_change  = true
         config.show_currency_selector = true
       end
@@ -26,7 +26,6 @@
     context 'and :show_currency_selector is false' do
       before do
         reset_spree_preferences do |config|
-          config.supported_currencies   = 'USD,EUR,GBP'
           config.allow_currency_change  = true
           config.show_currency_selector = false
         end
@@ -43,7 +42,6 @@
       context 'and show_currency_selector is true' do
         before do
           reset_spree_preferences do |config|
-            config.supported_currencies   = 'USD,EUR,GBP'
             config.allow_currency_change  = false
             config.show_currency_selector = true
           end
diff --git a/frontend/spec/features/template_rendering_spec.rb b/frontend/spec/features/template_rendering_spec.rb
index c30671df59a..e741cb4306d 100644
--- a/frontend/spec/features/template_rendering_spec.rb
+++ b/frontend/spec/features/template_rendering_spec.rb
@@ -7,7 +7,8 @@
       name: 'My Spree Store',
       url: 'spreestore.example.com',
       mail_from_address: 'test@example.com',
-      default_currency: 'USD'
+      default_currency: 'USD',
+      supported_currencies: 'USD'
     )
 
     visit spree.root_path