From 60ea59a0dc5942c28ac69a4d786eb695b4b36ffc Mon Sep 17 00:00:00 2001
From: John Hawthorn <john@stembolt.com>
Date: Thu, 27 Oct 2016 13:15:46 -0700
Subject: [PATCH] Allow editing multiple stores

---
 .../admin/general_settings_controller.rb      | 35 --------
 .../spree/admin/stores_controller.rb          | 23 ++++++
 .../app/models/spree/backend_configuration.rb |  6 +-
 .../admin/general_settings/edit.html.erb      | 80 -------------------
 .../admin/shared/_configuration_menu.html.erb |  4 +-
 .../admin/shared/_settings_sub_menu.html.erb  |  4 +-
 .../views/spree/admin/stores/_form.html.erb   | 52 ++++++++++++
 .../views/spree/admin/stores/edit.html.erb    | 19 +++++
 .../views/spree/admin/stores/index.html.erb   | 41 ++++++++++
 .../app/views/spree/admin/stores/new.html.erb | 15 ++++
 backend/config/routes.rb                      |  2 +-
 ...general_settings_spec.rb => store_spec.rb} |  9 +--
 core/config/locales/en.yml                    | 10 ++-
 13 files changed, 169 insertions(+), 131 deletions(-)
 delete mode 100644 backend/app/controllers/spree/admin/general_settings_controller.rb
 create mode 100644 backend/app/controllers/spree/admin/stores_controller.rb
 delete mode 100644 backend/app/views/spree/admin/general_settings/edit.html.erb
 create mode 100644 backend/app/views/spree/admin/stores/_form.html.erb
 create mode 100644 backend/app/views/spree/admin/stores/edit.html.erb
 create mode 100644 backend/app/views/spree/admin/stores/index.html.erb
 create mode 100644 backend/app/views/spree/admin/stores/new.html.erb
 rename backend/spec/features/admin/configuration/{general_settings_spec.rb => store_spec.rb} (86%)

diff --git a/backend/app/controllers/spree/admin/general_settings_controller.rb b/backend/app/controllers/spree/admin/general_settings_controller.rb
deleted file mode 100644
index 66efd94617e..00000000000
--- a/backend/app/controllers/spree/admin/general_settings_controller.rb
+++ /dev/null
@@ -1,35 +0,0 @@
-module Spree
-  module Admin
-    class GeneralSettingsController < Spree::Admin::BaseController
-      include Spree::Backend::Callbacks
-
-      before_action :set_store
-
-      def edit
-      end
-
-      def update
-        if @store.update_attributes(store_params)
-          flash[:success] = Spree.t(:successfully_updated, resource: Spree.t(:general_settings))
-          redirect_to edit_admin_general_settings_path
-        else
-          render :edit
-        end
-      end
-
-      private
-
-      def store_params
-        params.require(:store).permit(permitted_params)
-      end
-
-      def permitted_params
-        Spree::PermittedAttributes.store_attributes
-      end
-
-      def set_store
-        @store = current_store
-      end
-    end
-  end
-end
diff --git a/backend/app/controllers/spree/admin/stores_controller.rb b/backend/app/controllers/spree/admin/stores_controller.rb
new file mode 100644
index 00000000000..c9ee06163fb
--- /dev/null
+++ b/backend/app/controllers/spree/admin/stores_controller.rb
@@ -0,0 +1,23 @@
+module Spree
+  module Admin
+    class StoresController < Spree::Admin::ResourceController
+      def index
+        if Spree::Store.count == 1
+          redirect_to edit_admin_store_path(Spree::Store.first)
+        else
+          @stores = Spree::Store.all
+        end
+      end
+
+      private
+
+      def store_params
+        params.require(:store).permit(permitted_params)
+      end
+
+      def permitted_params
+        Spree::PermittedAttributes.store_attributes
+      end
+    end
+  end
+end
diff --git a/backend/app/models/spree/backend_configuration.rb b/backend/app/models/spree/backend_configuration.rb
index 4fc05854572..c44a7956377 100644
--- a/backend/app/models/spree/backend_configuration.rb
+++ b/backend/app/models/spree/backend_configuration.rb
@@ -9,7 +9,7 @@ class BackendConfiguration < Preferences::Configuration
                             :variants, :product_properties, :taxonomies,
                             :taxons]
     REPORT_TABS        ||= [:reports]
-    CONFIGURATION_TABS ||= [:configurations, :general_settings, :tax_categories,
+    CONFIGURATION_TABS ||= [:stores, :tax_categories,
                             :tax_rates, :zones, :countries, :states,
                             :payment_methods, :shipping_methods,
                             :shipping_categories, :stock_locations,
@@ -90,10 +90,10 @@ def menu_items
         MenuItem.new(
           CONFIGURATION_TABS,
           'wrench',
-          condition: -> { can?(:admin, :general_settings) },
+          condition: -> { can?(:admin, Spree::Store) },
           label: :settings,
           partial: 'spree/admin/shared/settings_sub_menu',
-          url: :edit_admin_general_settings_path
+          url: :admin_stores_path
         ),
         MenuItem.new(
           PROMOTION_TABS,
diff --git a/backend/app/views/spree/admin/general_settings/edit.html.erb b/backend/app/views/spree/admin/general_settings/edit.html.erb
deleted file mode 100644
index aa45eac44d2..00000000000
--- a/backend/app/views/spree/admin/general_settings/edit.html.erb
+++ /dev/null
@@ -1,80 +0,0 @@
-<%= render 'spree/admin/shared/general_tabs' %>
-
-<% admin_breadcrumb(Spree.t(:settings)) %>
-<% admin_breadcrumb(Spree.t(:general_settings)) %>
-<%= form_for @store, url: admin_general_settings_path do |f| %>
-  <div id="preferences" data-hook>
-
-    <fieldset class="general no-border-top">
-
-      <div data-hook="admin_general_setting_input_name">
-        <%= f.field_container :name do %>
-          <%= f.label :name %>
-          <%= f.text_field :name, class: 'fullwidth' %>
-          <%= f.error_message_on :name %>
-        <% end %>
-      </div>
-
-      <div data-hook="admin_general_setting_input_seo_title">
-        <%= f.field_container :seo_title do %>
-          <%= f.label :seo_title %>
-          <%= f.text_field :seo_title, class: 'fullwidth'  %>
-          <%= f.error_message_on :seo_title %>
-        <% end %>
-      </div>
-
-      <div data-hook="admin_general_setting_input_meta_keywords">
-        <%= f.field_container :meta_keywords do %>
-          <%= f.label :meta_keywords %>
-          <%= f.text_field :meta_keywords, class: 'fullwidth'  %>
-          <%= f.error_message_on :meta_keywords %>
-        <% end %>
-      </div>
-
-      <div data-hook="admin_general_setting_input_meta_description">
-        <%= f.field_container :meta_description do %>
-          <%= f.label :meta_description %>
-          <%= f.text_field :meta_description, class: 'fullwidth'  %>
-          <%= f.error_message_on :meta_description %>
-        <% end %>
-      </div>
-
-      <div data-hook="admin_general_setting_input_url">
-        <%= f.field_container :url do %>
-          <%= f.label :url %>
-          <%= f.text_field :url, class: 'fullwidth'  %>
-          <%= f.error_message_on :url %>
-        <% end %>
-      </div>
-
-      <div data-hook="admin_general_setting_mail_from_address">
-        <%= f.field_container :mail_from_address do %>
-          <%= f.label :mail_from_address %>
-          <%= f.text_field :mail_from_address, class: 'fullwidth'  %>
-          <%= f.error_message_on :mail_from_address %>
-        <% end %>
-      </div>
-
-      <div data-hook="admin_general_setting_default_tax_country">
-        <%= f.field_container :cart_tax_country_iso do %>
-          <%= f.field_hint :cart_tax_country_iso %>
-          <%= f.label :cart_tax_country_iso %>
-          <%= f.select :cart_tax_country_iso,
-                       Spree::Country.all.map { |c| [c.name, c.iso] },
-                       { include_blank: t(".no_cart_tax_country") },
-                       { class: "select2 fullwidth" } %>
-          <%= f.error_message_on :cart_tax_country_iso %>
-        <% end %>
-      </div>
-
-      <% if can? :update, :general_settings %>
-        <div class="form-buttons filter-actions actions" data-hook="buttons">
-          <%= button Spree.t('actions.update') %>
-          <%= link_to Spree.t('actions.cancel'), edit_admin_general_settings_url, :class => 'button' %>
-        </div>
-      <% end %>
-
-    </fieldset>
-
-  </div>
-<% end %>
diff --git a/backend/app/views/spree/admin/shared/_configuration_menu.html.erb b/backend/app/views/spree/admin/shared/_configuration_menu.html.erb
index 691e81e8b61..fe28dbda2f1 100644
--- a/backend/app/views/spree/admin/shared/_configuration_menu.html.erb
+++ b/backend/app/views/spree/admin/shared/_configuration_menu.html.erb
@@ -4,8 +4,8 @@
 <% content_for :tabs do %>
   <nav>
     <ul class="tabs" data-hook="admin_configurations_sidebar_menu">
-      <% if can?(:edit, :general_settings) %>
-        <%= settings_tab_item Spree.t(:settings), edit_admin_general_settings_path %>
+      <% if can?(:edit, Spree::Store) %>
+        <%= settings_tab_item plural_resource_name(Spree::Store), admin_stores_path %>
       <% end %>
     </ul>
   </nav>
diff --git a/backend/app/views/spree/admin/shared/_settings_sub_menu.html.erb b/backend/app/views/spree/admin/shared/_settings_sub_menu.html.erb
index 8eeccb617d3..95e373ba49e 100644
--- a/backend/app/views/spree/admin/shared/_settings_sub_menu.html.erb
+++ b/backend/app/views/spree/admin/shared/_settings_sub_menu.html.erb
@@ -1,6 +1,6 @@
 <ul class="admin-subnav" data-hook="admin_settings_sub_tabs">
-  <% if can?(:edit, :general_settings) %>
-    <%= tab :general_settings, label: :general, url: spree.edit_admin_general_settings_path, match_path: /\/general_settings/ %>
+  <% if can?(:admin, Spree::Store) %>
+    <%= tab :stores, label: :stores, url: spree.admin_stores_path %>
   <% end %>
 
   <% if can?(:display, Spree::PaymentMethod) %>
diff --git a/backend/app/views/spree/admin/stores/_form.html.erb b/backend/app/views/spree/admin/stores/_form.html.erb
new file mode 100644
index 00000000000..194246bf662
--- /dev/null
+++ b/backend/app/views/spree/admin/stores/_form.html.erb
@@ -0,0 +1,52 @@
+<%= f.field_container :name do %>
+  <%= f.label :name, class: 'required' %>
+  <%= f.text_field :name, required: true, class: 'fullwidth' %>
+  <%= f.error_message_on :name %>
+<% end %>
+
+<%= f.field_container :code do %>
+  <%= f.label :code, class: 'required' %>
+  <%= f.text_field :code, required: true, class: 'fullwidth' %>
+  <%= f.error_message_on :code %>
+<% end %>
+
+<%= f.field_container :seo_title do %>
+  <%= f.label :seo_title %>
+  <%= f.field_hint :seo_title %>
+  <%= f.text_field :seo_title, class: 'fullwidth'  %>
+  <%= f.error_message_on :seo_title %>
+<% end %>
+
+<%= f.field_container :meta_keywords do %>
+  <%= f.label :meta_keywords %>
+  <%= f.text_field :meta_keywords, class: 'fullwidth'  %>
+  <%= f.error_message_on :meta_keywords %>
+<% end %>
+
+<%= f.field_container :meta_description do %>
+  <%= f.label :meta_description %>
+  <%= f.text_field :meta_description, class: 'fullwidth'  %>
+  <%= f.error_message_on :meta_description %>
+<% end %>
+
+<%= f.field_container :url do %>
+  <%= f.label :url, class: 'required' %>
+  <%= f.text_field :url, required: true, class: 'fullwidth'  %>
+  <%= f.error_message_on :url %>
+<% end %>
+
+<%= f.field_container :mail_from_address do %>
+  <%= f.label :mail_from_address, class: 'required' %>
+  <%= f.text_field :mail_from_address, required: true, class: 'fullwidth'  %>
+  <%= f.error_message_on :mail_from_address %>
+<% end %>
+
+<%= f.field_container :cart_tax_country_iso do %>
+  <%= f.label :cart_tax_country_iso %>
+  <%= f.field_hint :cart_tax_country_iso %>
+  <%= f.select :cart_tax_country_iso,
+    Spree::Country.all.map { |c| [c.name, c.iso] },
+    { include_blank: t(".no_cart_tax_country") },
+    { class: "select2 fullwidth" } %>
+  <%= f.error_message_on :cart_tax_country_iso %>
+<% end %>
diff --git a/backend/app/views/spree/admin/stores/edit.html.erb b/backend/app/views/spree/admin/stores/edit.html.erb
new file mode 100644
index 00000000000..ec7b19308fc
--- /dev/null
+++ b/backend/app/views/spree/admin/stores/edit.html.erb
@@ -0,0 +1,19 @@
+<%= render 'spree/admin/shared/general_tabs' %>
+
+<% admin_breadcrumb(link_to(plural_resource_name(Spree::Store), admin_stores_path)) %>
+<% admin_breadcrumb(@store.name) %>
+
+<% content_for :page_actions do %>
+  <li>
+    <%= button_link_to Spree.t(:new_store), new_admin_store_url %>
+  </li>
+<% end %>
+
+<%= form_for [:admin, @store] do |f| %>
+  <fieldset class="no-border-top">
+    <%= render 'form', f: f %>
+    <% if can? :update, @store %>
+      <%= render 'spree/admin/shared/edit_resource_links' %>
+    <% end %>
+  </fieldset>
+<% end %>
diff --git a/backend/app/views/spree/admin/stores/index.html.erb b/backend/app/views/spree/admin/stores/index.html.erb
new file mode 100644
index 00000000000..95d406c177d
--- /dev/null
+++ b/backend/app/views/spree/admin/stores/index.html.erb
@@ -0,0 +1,41 @@
+<%= render 'spree/admin/shared/general_tabs' %>
+
+<% content_for :page_title do %>
+  <%= plural_resource_name(Spree::Store) %>
+<% end %>
+
+<% content_for :page_actions do %>
+  <% if can?(:create, Spree::Store) %>
+    <li>
+      <%= link_to Spree.t(:new_store), new_admin_store_url, class: 'button' %>
+    </li>
+  <% end %>
+<% end %>
+
+<table class="index">
+  <thead>
+    <tr>
+      <th>Name</th>
+      <th>Url</th>
+      <th class="actions"></th>
+    </tr>
+  </thead>
+  <tbody>
+    <% @stores.each do |store| %>
+      <tr>
+        <td>
+          <%= store.name %>
+          <% if store.default? %>
+            <span class="label label-default">default</span>
+          <% end %>
+        </td>
+        <td><%= store.url %></td>
+        <td class="actions">
+          <% if can?(:edit, store) %>
+            <%= link_to_edit store, :no_text => true %>
+          <% end %>
+        </td>
+      </tr>
+    <% end %>
+  </tbody>
+</table>
diff --git a/backend/app/views/spree/admin/stores/new.html.erb b/backend/app/views/spree/admin/stores/new.html.erb
new file mode 100644
index 00000000000..c7e28a13093
--- /dev/null
+++ b/backend/app/views/spree/admin/stores/new.html.erb
@@ -0,0 +1,15 @@
+<%= render 'spree/admin/shared/general_tabs' %>
+
+<% admin_breadcrumb(link_to(plural_resource_name(Spree::Store), admin_stores_path)) %>
+<% admin_breadcrumb(Spree.t(:new_store)) %>
+
+<% content_for :page_actions do %>
+<% end %>
+
+<%= form_for [:admin, @store] do |f| %>
+  <%= render 'form', f: f %>
+
+  <% if can? :create, @store %>
+    <%= render 'spree/admin/shared/new_resource_links' %>
+  <% end %>
+<% end %>
diff --git a/backend/config/routes.rb b/backend/config/routes.rb
index f9f50d1455e..ea0be4280e2 100644
--- a/backend/config/routes.rb
+++ b/backend/config/routes.rb
@@ -120,7 +120,7 @@
       end
     end
 
-    resource :general_settings, only: [:edit, :update]
+    resources :stores, only: [:index, :new, :create, :edit, :update]
 
     resources :return_items, only: [:update]
 
diff --git a/backend/spec/features/admin/configuration/general_settings_spec.rb b/backend/spec/features/admin/configuration/store_spec.rb
similarity index 86%
rename from backend/spec/features/admin/configuration/general_settings_spec.rb
rename to backend/spec/features/admin/configuration/store_spec.rb
index a9ae1749810..bc5ccea3038 100644
--- a/backend/spec/features/admin/configuration/general_settings_spec.rb
+++ b/backend/spec/features/admin/configuration/store_spec.rb
@@ -20,7 +20,6 @@
 
   context "visiting general store settings" do
     it "should have the right content" do
-      expect(page).to have_content("SettingsStore")
       expect(page).to have_field("store_name", with: "Test Store")
       expect(page).to have_field("store_url", with: "test.example.org")
       expect(page).to have_field("store_mail_from_address", with: "test@example.org")
@@ -33,7 +32,7 @@
       fill_in "store_mail_from_address", with: "spree@example.org"
       click_button "Update"
 
-      assert_successful_update_message(:general_settings)
+      expect(page).to have_content "successfully updated"
       expect(page).to have_field("store_name", with: "Spree Demo Site99")
       expect(page).to have_field("store_mail_from_address", with: "spree@example.org")
     end
@@ -44,18 +43,18 @@
       select "Germany", from: "Tax Country for Empty Carts"
       click_button "Update"
 
-      assert_successful_update_message(:general_settings)
+      expect(page).to have_content("has been successfully updated")
       expect(page).to have_select("Tax Country for Empty Carts", selected: "Germany")
     end
   end
 
   context "update fails" do
     it "should display the error" do
-      fill_in "Site Name", with: ""
+      fill_in "Site Name", with: " "
       click_button "Update"
 
       expect(page).to have_content("can't be blank")
-      expect(page).to have_field("Site Name", with: "")
+      expect(page).to have_field("Site Name", with: " ")
     end
   end
 end
diff --git a/core/config/locales/en.yml b/core/config/locales/en.yml
index 8f737410815..0356a972bf2 100644
--- a/core/config/locales/en.yml
+++ b/core/config/locales/en.yml
@@ -517,6 +517,9 @@ en:
       spree/stock_transfer:
         one: Stock Transfer
         other: Stock Transfers
+      spree/store:
+        one: Store
+        other: Stores
       spree/store_credit:
         one: Store Credit
         other: Store Credits
@@ -742,8 +745,8 @@ en:
     adjustment_total: Adjustment Total
     adjustments: Adjustments
     admin:
-      general_settings:
-        edit:
+      stores:
+        form:
           no_cart_tax_country: "No taxes on carts without address"
       images:
         index:
@@ -815,7 +818,6 @@ en:
         checkout: Refunds and Returns
         configuration: Configuration
         display_order: Display Order
-        general: Store
         option_types: Option Types
         orders: Orders
         overview: Overview
@@ -831,6 +833,7 @@ en:
         stock: Stock
         stock_items: Store Stock
         stock_transfers: Stock Transfers
+        stores: Stores
         taxes: Taxes
         taxonomies: Taxonomies
         taxons: Taxons
@@ -1388,6 +1391,7 @@ en:
     new_stock_movement: New Stock Movement
     new_stock_transfer: New Stock Transfer
     new_store_credit: New Store Credit
+    new_store: New Store
     new_tax_category: New Tax Category
     new_tax_rate: New Tax Rate
     new_taxon: New Taxon