Allowing admin to show all countries regardless checkout zone

solidusio · Feb 20, 2018 · 9d6722c · 9d6722c
1 parent 9cac529
commit 9d6722c
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 4 deletions.
diff --git a/backend/app/views/spree/admin/prices/_form.html.erb b/backend/app/views/spree/admin/prices/_form.html.erb
@@ -15,7 +15,7 @@
         <%= f.field_container :country do %>
           <%= f.label :country %>
           <%= f.field_hint :country %>
-          <%= f.collection_select :country_iso, available_countries, :iso, :name,
+          <%= f.collection_select :country_iso, available_countries(restrict_to_zone: nil), :iso, :name,
                                   {
                                     include_blank: t(:any_country, scope: [:spree, :admin, :prices])
                                   },

diff --git a/backend/app/views/spree/admin/stock_locations/_form.html.erb b/backend/app/views/spree/admin/stock_locations/_form.html.erb
@@ -107,7 +107,7 @@
 
     <%= f.field_container :country_id do %>
       <%= f.label :country_id %>
-      <span id="country"><%= f.collection_select :country_id, available_countries, :id, :name, { include_blank: true }, { class: 'custom-select js-country_id fullwidth' } %></span>
+      <span id="country"><%= f.collection_select :country_id, available_countries(restrict_to_zone: nil), :id, :name, { include_blank: true }, { class: 'custom-select js-country_id fullwidth' } %></span>
     <% end %>
 
     <%= f.field_container :state do %>

diff --git a/core/app/helpers/spree/base_helper.rb b/core/app/helpers/spree/base_helper.rb
@@ -106,8 +106,8 @@ def taxons_tree(root_taxon, current_taxon, max_level = 1)
       end
     end
 
-    def available_countries
-      checkout_zone = Zone.find_by(name: Spree::Config[:checkout_zone])
+    def available_countries(restrict_to_zone: Spree::Config[:checkout_zone])
+      checkout_zone = Zone.find_by(name: restrict_to_zone)
 
       if checkout_zone && checkout_zone.kind == 'country'
         countries = checkout_zone.country_list

diff --git a/core/spec/helpers/base_helper_spec.rb b/core/spec/helpers/base_helper_spec.rb
@@ -37,6 +37,10 @@
         it "return only the countries defined by the checkout zone" do
           expect(available_countries).to eq([country])
         end
+
+        it "returns only the countries defined by the checkout zone passed as parameter" do
+          expect(available_countries(restrict_to_zone: @country_zone.name)).to eq([country])
+        end
       end
 
       context "checkout zone is of type state" do